Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev am: 07d8249c4b
am: cc8aa11f6c  -s ours

Change-Id: If6a18f0d0807b558a2329ede06393eb18814a85d