Merge "dumpstate: Close API FDs on exec"