Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am: 242c22c900
am: 62e72c21f5

Change-Id: I911580693ea5fcba1581726a837bbad5104402bf