Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names."