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