Merge "Clean up CLOEXEC in SocketListener."
am: ed83cfba68

* commit 'ed83cfba68d51e5de3a50a1ca5d471fd7244a17a':
  Clean up CLOEXEC in SocketListener.