Merge "Revert "Add support for unique_fds and vectors of file descriptors"" am: 5cd09786eb
am: fb92cfcd3e

* commit 'fb92cfcd3e8977a6cac0147de80bf2a0fb6a2d87':
  Revert "Add support for unique_fds and vectors of file descriptors"