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

Change-Id: I8fa65b89f1f10fe8920aa45d14c7b917b6bc74d8