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

Change-Id: I7dfb1a020b1c3da9e0af5a7096fda0775751eab3