Merge "common_time_server.cpp: more O_CLOEXEC" am: 78d5f90d98
am: a87b9287a4

* commit 'a87b9287a4801ce39f30dbd84c3eac2f66c99992':
  common_time_server.cpp: more O_CLOEXEC