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

* commit '51397c4b4434d5a375382237ce5fc40db18deb9a':
  Pass in current android.jar to api-generator