Merge "adb: split daemon services out of service_to_fd."
am: 1ba2e6a27f

Change-Id: I372aff6c14a56ae5e50db1edb31b01c7924223b9