Merge "More O_CLOEXEC"