Merge "[automerger skipped] Merge "Convert ExtServices/Android.mk to Android.bp." am: 992fee4a09 am: 3167534e48 -s ours am: 89970ab224 -s ours am: 5dc4d56514 -s ours am skip reason: change_id Ib239d928fa37ee8286a232b2798d02262e874cbc with SHA1 0e66f06192 is in history"