Merge "AAPT2: Fix R.java for styleable in different package"