Merge "fix typo introduced in SurfaceTextureClient to Surface renaming"