Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev am: 150bafd217
am: cc6e856522

Change-Id: Ie22b644b07da19fcc51e59529f5e38ee2f1f9137