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

Change-Id: I9b9d8c97899a09b58394db642829f6cb4a75f108