Merge "AAPT2: Change how we generate Java classes" into nyc-dev