am 37019a1d: am d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."

* commit '37019a1de6ace9eec11edb28e29c8f42ee7bd379':
  Remove HAVE_SYS_SOCKET_H.