Merge "emulator Opengl - slight type change for GLESv2"