Revert of New GM that exercises gamma-correctness in various parts of the pipeline.

src/core/SkBlitter_Sprite.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSmallAllocator.h"
 #include "SkSpriteBlitter.h"
 
@@ skipping 42 matching lines @@
     */
     SkASSERT(allocator != nullptr);
 
     SkSpriteBlitter* blitter;
 
     switch (dst.colorType()) {
         case kRGB_565_SkColorType:
             blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
             break;
         case kN32_SkColorType:
-            if (dst.info().isSRGB() || source.info().isSRGB()) {
-                blitter = SkSpriteBlitter::ChooseNew32(source, paint, allocator,
-                                                       dst.info().profileType());
+            if (dst.info().isSRGB()) {
+                blitter = SkSpriteBlitter::ChooseS32(source, paint, allocator);
             } else {
-                blitter = SkSpriteBlitter::ChooseLegacy32(source, paint, allocator);
+                blitter = SkSpriteBlitter::ChooseL32(source, paint, allocator);
             }
             break;
         case kRGBA_F16_SkColorType:
             blitter = SkSpriteBlitter::ChooseF16(source, paint, allocator);
             break;
         default:
             blitter = nullptr;
             break;
     }
 
     if (blitter) {
         blitter->setup(dst, left, top, paint);
     }
     return blitter;
 }