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

* commit '66e8024f9ce6c2f4273a71e592077c61a93ebcff':
  Revert "Introduce unique_fd"