Merge "AAPT2: Fix processing of quotes in XML" into oc-dr1-dev