[automerger skipped] Merge "Remove unnecessary proguard flags" am: ebafd23efd
am: 0f8646ff46  -s ours

Change-Id: Ia49e62aeec15dd615cc62f8891fe11a58e2db8d6