Merge "libbinder_ndk: don't borrow fd into unique_fd"