Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."