Merge "dumpstate: add O_CLOEXEC"