[automerger skipped] Merge "Revert "Update to minigbm"" into tm-dev am: dedc6ef4e3 -s ours am: f05957e357 -s ours

am skip reason: Merged-In I004805d6dc867fbb0afa8e4d1ecaeba8db34d1f4 with SHA-1 1f1b9889b8 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/19151728

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