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