Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev
am: b986ebce75

Change-Id: I16382162fecf323074c13b376a23fccab1da092b