Merge "libbinder_ndk: don't borrow fd into unique_fd" am: 637113c267 am: ba7a315924

Change-Id: I36f95c6a8e40b2535df88ac044116b74150e2279