Merge "AAPT2: Fix R.java styleable + indices ordering"