Merge "libbinder: Fix Trusty build from __ANDROID_VENDOR__" into main