Merge "Revert "Revert "Split adb_main.cpp into client and daemon."""