Merge "goldfish-opengl: Make VirtGpu.h method args const"