Merge "goldfish-opengl: One virtio-gpu instance per API instance" am: d64a2c6857 am: fe465a374b

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

Change-Id: Id0db1ec2e1427adef6a5d9a07fa5affa4f2c0450