Merge "libadbd_services: remove unused deps"