[automerger skipped] Merge "Add default proguard flags from guava" am: 727ef10366
am: 15e4096803 -s ours
am skip reason: change_id Ia9948d597538a16c5b7ab26a2e41eebde52e7427 with SHA1 b4917146aa is in history

Change-Id: I0c2dd9f1cd8e47b9411dc2e92e3d9c6f112ab083