am e4d3b06b: Merge "get rid of uses of getISurfaceTexture"

* commit 'e4d3b06b6ddb055739b8b2aa82ffc7840588253a':
  get rid of uses of getISurfaceTexture