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

Change-Id: I661323479dd229179b2d8e8b785aa822243374a1