Merge "Fix incorrect error checking on unique_fd"