am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev

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