Merge "trace-dev.c: more O_CLOEXEC"