[automerger skipped] Update trampolines and stubs am: 3414fdb1c5 am: e3e7c993b5 -s ours am: ffc57a5055 -s ours am: bab954101a -s ours

am skip reason: Change-Id Ib27399b76c272c404a0a153597bfe8fd101142fa with SHA-1 9c7d462c31 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/1364756

Change-Id: Ibf11ca96e7d10b5fb22084e2ce4311a7ec60a282