Merge "updater_sample: update tools" am: daa86e9024 am: 9fdeb57ab0
am: e6a50aa78d

Change-Id: I4172bea382b100981640d566b9b9433df23375a0