Merge "Update ApiGenerator to only deal with android.jar."