Merge "AAPT2: Fix processing of quotes in XML" am: 9b65f03abf am: 9bf83b4cd1
am: 63c3aa9a45

Change-Id: I8c691fdcbe58c5fe60f0a55ed710f266f51c3f25