Merge "More O_CLOEXEC" am: 43e4260831
am: 66824c36ce

* commit '66824c36ce08ae86a057440e33a5fe1a23ef01f1':
  More O_CLOEXEC