Merge "get rid of uses of getISurfaceTexture"