Merge "Revert "stop using a deprecated SurfaceTextureClient ctor""