Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e
am: 2ee3614be3

Change-Id: I0849351afb0796f430b71263c250b2e721f665fd