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

* commit '58bc0cb1c1204d52dd1d57f2998796c79d467b2f':
  Revert "Revert "Split adb_main.cpp into client and daemon.""