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

Change-Id: Ib8732dd2899f01009875149a7d6d9bba6aa16716