Merge "goldfish-opengl: differentiate goldfish/virtio-gpu via minigbm only" am: 8502cbb2f0 am: 4ec2854620

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

Change-Id: I95fe16d90d9355a68289e59ad0455c811156745c