Merge "Revert "Introduce unique_fd"" into nyc-dev
am: 263d140895

* commit '263d140895f0e61cda27301a21e4ce18651d4eb4':
  Revert "Introduce unique_fd"