Merge "emulator opengl: fixing clean windows build"