am 5e14f416: am 6864e673: Merge "More SOCK_CLOEXEC"

* commit '5e14f416afa412e49ebb07239e6e570c9405518d':
  More SOCK_CLOEXEC