Merge "updater_sample: change gen_update_config args" am: eeabbecb64 am: 493e6cb9e0
am: 0f191fc8f6

Change-Id: I1a034e70f0507c89f706f704b75572d4cd24eeed