Merge "Support socket activation of adb server"