Merge changes from topic "libbinder_ndk_unit_test"
am: a17d0e1fe6

Change-Id: Ibc5d2f37d884d20baa4f4bb2ded8175c5de64770