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