Merge "more O_CLOEXEC"
am: 920d637d25

* commit '920d637d258d985fbf5a85bbe4dcc157ad449a0d':
  more O_CLOEXEC