Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev