Merge "AAPT2: Fix unrecognized CDATA"