Merge "adb: don't close sockets before hitting EOF."