Merge "Rename ISurfaceTexture and SurfaceTexture"