Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev