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

Change-Id: If635231da8db6658ba1e016c4c84292e73972066