Merge "AAPT2: Fix string escaping" into oc-dev am: f6bc1402ed
am: 349b647b75

Change-Id: I2208380a8dbeb7df11790ebd05823f46616d2d06