Merge "AAPT2: Update locale script filtering logic" into oc-dev am: 3cd6e0bee5
am: 9d6a0d73e6

Change-Id: I0275456778a39ebf3627f0aa848065e8fc9e0db2