Merge "adb: fix adb client running out of sockets on Windows"