Merge "Revert "Revert "Add a way to turn off unique_fd's operator int."""