Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am: dcc5575
am: 1c58569

* commit '1c585692a37eef2d28e01db451879f7f53dc97a1':
  Revert "libbinder: Replace ScopedFd with base::unique_fd"

Change-Id: Iae20ab4fac161b0785b011b42353ebf46de1c59a