Merge "Revert "Update to minigbm"" into tm-dev am: dedc6ef4e3 am: ff783346d4

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

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