Merge "Revert "Add support for unique_fds and vectors of file descriptors""