Merge "adbd: make libadbd_services cc_library again."