Merge "libbinder_ndk: vendor available" am: 658187ca59 am: 1814452fe4
am: 7420df43d7

Change-Id: Ib24e77929ffdf3bd480b1fef2647b35e291a6cd8