Merge "Do not destroy adb socket when it is running over TCP."