am 6c65668a: Merge "Added proguard 5.2.1"

* commit '6c65668a8076b99ec6cac19713af119940407986':
  Added proguard 5.2.1