Merge "AAPT2: Update locale script filtering logic" into oc-dev