Merge "Revert "Support socket activation of adb server""