Merge "Remove goto used in SurfaceUtils"