Update from https://crrev.com/314320

skia/skia_library.gypi

Index: skia/skia_library.gypi
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index a3903bf20131ebab8f1abd8637bfeeb6628cfb8c..6a1c16c04d52db445b3e1a69daa023c032045da0 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -32,8 +32,6 @@
     '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
-    '../third_party/skia/src/opts/opts_check_x86.cpp',
-
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
@@ -225,12 +223,6 @@
         '../build/android/cpufeatures.gypi',
       ],
     }],
-    [ 'target_arch == "arm" or target_arch == "arm64" or \
-       target_arch == "mipsel" or target_arch == "mips64el"', {
-      'sources!': [
-        '../third_party/skia/src/opts/opts_check_x86.cpp'
-      ],
-    }],
     [ 'desktop_linux == 1 or chromeos == 1', {
       'dependencies': [
         '../build/linux/system.gyp:fontconfig',
@@ -289,9 +281,6 @@
         #  list.
         '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
       ],
-      'sources/': [
-        ['exclude', 'opts_check_x86\\.cpp$'],
-      ],
 
       # The main skia_opts target does not currently work on iOS because the
       # target architecture on iOS is determined at compile time rather than