Merge "updater_sample: add proguard.flags" am: 5af63a45d9 am: 468ad1d965
am: 2cc87497c4

Change-Id: I121f04b84aa23259fb696bdf9dfe756ff87609a4