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

Change-Id: I31f0c21dcf391384759e71112957ccdc281965d3