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

* commit '8f2ea09e1682bd20ee3f5b883eaf17b6c52335f1':
  Pass in current android.jar to api-generator