am 9d470fc7: am dd6f7b8d: Merge "Revert "Revert "Split adb_main.cpp into client and daemon."""

* commit '9d470fc776cf5fefd9800db66e25ad29850c3b43':
  Revert "Revert "Split adb_main.cpp into client and daemon.""