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

Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed