Merge "More O_CLOEXEC"
am: 43e4260831

* commit '43e4260831cc3d0d96c05fe18a8cad3018b5795f':
  More O_CLOEXEC