Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae
am: 441f38e9e5

Change-Id: I08bd1360a9c7301c513110f00015d6f31314591e