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

Change-Id: I3295e61dcf29a7cb242b4ee0017f2fd94a0cfd65