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

Change-Id: I0a3235052cea9041cf6c944f71879d304bce5a56