Merge "AAPT2: Fix pseudolocalization to respect <xliff:g>"