Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev am: 448727bdae
am: 557f8f72c8

Change-Id: Ic6d09cc47c988999f1c566afaa676a59c7a04b41