am 6864e673: Merge "More SOCK_CLOEXEC"

* commit '6864e6739027adf725ced33777d3e21f80a95479':
  More SOCK_CLOEXEC