Merge "Convert ExtServices/Android.mk to Android.bp."
am: 992fee4a09

Change-Id: Ic336e66e84ae142228c676d150a94339b650b008