am 1c9d7220: am 1c445205: Merge "Pass in current android.jar to api-generator"

* commit '1c9d7220caa091a29c2855e7fa3e32daeb4e53be':
  Pass in current android.jar to api-generator