Merge "AAPT2: Differentiate between Android and Java package names"