Merge changes from topic "libbinder_ndk_unit_test" am: a17d0e1fe6 am: 76743263f5

Change-Id: I230b71ae0839c473ef1881d1ac0eadf17bac95b5