Merge "libbinder_ndk: add __ANDROID_VENDOR__ error" into main am: a35aa0fe12 am: d6060030dc am: 2da834d5b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2802638

Change-Id: Ifcc068c2512c6c977acd041e5408033be0f66360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>