Merge "Rebuild proguard.jar with ant/gradle support."
am: a90d411690

* commit 'a90d411690b2a62d42e7937a1e98d31de5e3c1f6':
  Rebuild proguard.jar with ant/gradle support.