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

Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1