Merge "Add the ScopedFd that we've never quite gotten around to."