Merge "AAPT2: normalize Manifest java identifiers."