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

Change-Id: I8be36dcf67b6d32f69fbefdf2bd78e04034f6bb8