Merge "libadbd_services: remove unused deps" am: a1821e13f3
am: 1c9abb85cb

Change-Id: Ia37257bdda219c46b6e2a7dd5b54062cdd1c45cc