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