Merge "Fix SurfaceTexture CTS test case when using the Skia pipeline."