[automerger skipped] AAPT2: Differentiate between Android and Java package names am: ef506c73bb
am: 5cc5fdd0dc  -s ours

Change-Id: Ie50856b30994185dbf5ff706349296efcac5d24d