am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat"

Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'

* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
  Tools package was missing proguard.bat