Merge "Remove duplicated boxed handle func declarations" into main am: 734f20578e

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/3505756

Change-Id: Ica80558bef27c7b908d674f44140acbf175abad1
Signed-off-by: Automerger Merge Worker <[email protected]>