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