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

Change-Id: I1eb2442b6b3b629c6d2f75f95d280f9f196c4793