Merge "Merge "AAPT2: Fix processing of quotes in XML" into oc-dr1-dev am: 16cfd497 -s ours am: 4dabe266" into oc-mr1-dev-plus-aosp