[automerger skipped] Fix intercetable function clobber of big struct return am: a3d2528def am: bad17e5ec0 -s ours am: a7064d4ed5 am: b7f6508b3a

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

Change-Id: Ic4360bc03dffb027c7e0766985082244ebae9425