Merge "libbinder_ndk: add __ANDROID_VENDOR__ error" into main