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

Change-Id: I16b70a5fb8e5a6cfe486e8b817e260c52a4a149e