Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev