Merge "Hack to handle latest minigbm changes" am: fec253b829 am: c4b979a5ef

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2019198

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