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

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