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