Merge "Convert ExtServices/Android.mk to Android.bp." into qt-dev-plus-aosp