Revert "Merge upstream-main into main" am: b7a9a2b7d5

Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/3151140

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