am aa0bf696: am 4342213f: am 6c65668a: Merge "Added proguard 5.2.1"

* commit 'aa0bf696736449d4c34d0267f7b80e947b32d725':
  Added proguard 5.2.1