Merge "virtio_gpu.h: move map/unmap to 3d group" into android11-5.4