Merge "AAPT2: Fix processing of quotes in XML" into oc-dr1-dev
am: 16cfd497f5  -s ours

Change-Id: I6e5febeec5611ee1ccd86a0deae77b9af33569ea