Merge "Refactoring: Rename SurfaceTextureClient to Surface"