am 30c168c5: am ae25aed3: am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
am 30c168c5: am ae25aed3: am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."

* commit '30c168c570deb48f5ad0de0821f2fea0d149a635':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build