Merge "Renaming SurfaceEncoder to SurfaceMediaSource"