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

Change-Id: Ib819331248fd0e799f3679f9663500cf897ca3b4