Merge "AAPT2: Convert Android.mk to Android.bp"