Merge "adb server: don't close stale fd when TCP transport is closed"