Merge "Fix standalone build of native opengl tests" into klp-dev