Merge "OpenGL tests: Fix unused variables"