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