Merge "Update SurfaceMediaSource_test to not use pbuffer configs"