Merge changes Ic9186db2,Id5a7cdff

* changes:
  SurfaceTexture: disable a deadlocking test.
  SurfaceTexture: add a pixel tolerance to the tests.