Revert of AVX 2 SrcOver blits: color32, blitmask.

gyp/opts.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
         'none_sources': [
             '<(skia_src_path)/opts/SkBitmapProcState_opts_none.cpp',
             '<(skia_src_path)/opts/SkBlitMask_opts_none.cpp',
             '<(skia_src_path)/opts/SkBlitRow_opts_none.cpp',
         ],
@@ skipping 42 matching lines @@
             '<(skia_src_path)/opts/SkOpts_sse41.cpp',
         ],
         # These targets are empty, but XCode doesn't like that, so add an empty file to each.
         'sse42_sources': [
             '<(skia_src_path)/core/SkForceCPlusPlusLinking.cpp',
         ],
         'avx_sources': [
             '<(skia_src_path)/opts/SkOpts_avx.cpp',
         ],
         'avx2_sources': [
-            '<(skia_src_path)/opts/SkOpts_avx2.cpp',
+            '<(skia_src_path)/core/SkForceCPlusPlusLinking.cpp',
         ],
 }