Merge changes I896e0bc8,I27231c4f

* changes:
  libbinder_ndk: use __ANDROID_VENDOR__
  Partial: Reland "libbinder: remove __ANDROID_APEX__ stability diff"