Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev