Revert of roll skia DEPS to 14128

skia/skia_library_opts.gyp

Index: skia/skia_library_opts.gyp
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
index 99f86b455ee1e9b182b56e7b87cecc7fdbbff5e3..f71907581411d3f59e6caa7fc154349051e25a21 100644
--- a/skia/skia_library_opts.gyp
+++ b/skia/skia_library_opts.gyp
@@ -51,7 +51,7 @@
             '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
@@ -143,20 +143,15 @@
           ],
         }],
         [ 'target_arch == "arm64"',{
-          'sources': [
-            '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
-            '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
-            '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
+          # TODO(rmcilroy): Update this once http://crrev.com/143423004/ lands.
+          'sources': [
+            '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
+            '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
+            '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
       ],