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

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

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