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