Merge "Introduce unique_fd"
am: 9a6b8eeb44

* commit '9a6b8eeb44a78064ffbe4c04928a3904b1be2ab3':
  Introduce unique_fd