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

Change-Id: I11183a5cd03103f7033379944ec762841d559d4a