Merge "AAPT2: Fix issue with String flattening in XmlFlattener"