Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd""