Merge "Fix bogus error checking on unique_fd"