Merge "Revert "Escape single quotes in aapt2""