Merge "Revert "Escape single quotes in aapt2"" into tm-dev