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

Change-Id: I5bb4a63234cf3ee022bbf59edd5b613abefd8bef