Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16"