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

Change-Id: I91bef0b518749bf0f0f6cfb30bc9287d3876bef0