Merge "Convert java/Android.mk to Android.bp"