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

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

Change-Id: I8bbfb7e362933cadde8d34a1c09315d395a8d03e