Merge "Pass in current android.jar to api-generator"