Merge "updater_config: make utils/PayloadSpecs non-static" am: 928f2cbf9b am: 3714929c32
am: 154cdd99d6

Change-Id: If1786eba08d7746601b6870e16bce9141d504b57