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