Merge "SurfaceTextureClient: remove a deprecated ctor"