Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8
am: 888dae6c13

Change-Id: I0ce9c1daf2761d72b99a7f996b661f0646308efc