Merge changes Ic9186db2,Id5a7cdff

* changes:
  SurfaceTexture: disable a deadlocking test.
  SurfaceTexture: add a pixel tolerance to the tests.
tree: bbdf2bc63defba2671ac9c60a981b4da18140ca9
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE