Revert^2 "Merge upstream-main into main" am: fd19358a25

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

Change-Id: I32fdd6fc8534b6a6bd564f99426ba71492951876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>