Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
am: e7b0a330db

Change-Id: I7943dc35ceeca0c3fdb4df668a761889cd0add2d