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

Change-Id: Ibed7a996aed00e6e5cfdee457c40277469a95ebf