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

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