Merge "adbd: make libadbd_services cc_library again." am: 0ac447ab95 am: 3a3c6ec494

Change-Id: I9472129acc75f78a3ed14452e66241c4d5635b8a