Merge changes I84a02511,Ieae4ffb3 into main am: 7b1a78b429 Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/3171240 Change-Id: I262a9048c39cb5ce40e6f1e04397bbb776e74291 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>