Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev