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

* commit '2f54e05b36d0049b2db8694df978e9948444f7b1':
  More SOCK_CLOEXEC