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

Change-Id: I1f87fce18c665433ad916ac47cd3f78ae007c776