Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"