Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev am: 72b3d467 am: b08aa082 Change-Id: If635231da8db6658ba1e016c4c84292e73972066