Merge changes I47f147f8,Id09915c9,Iabc6d27c

* changes:
  SurfaceTexture: increase the test's Surface layer.
  SurfaceTexture: add some RGBA_8888 tests.
  SurfaceTextureClient: minor test refactoring.