Update from chromium https://crrev.com/301725/

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 2d2668a1d55c2805f8ff7ecf01dbd0f5046aea16..16e03a24cacdba33c4c144d65225e4b72bdab887 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -8,7 +8,7 @@
     # However, in the static mode, we need to build skia as multiple targets
     # in order to support the use case where a platform (e.g. Android) may
     # already have a copy of skia as a system library.
-    ['component=="static_library" and use_system_skia==0', {
+    ['component=="static_library"', {
       'targets': [
         {
           'target_name': 'skia_library',
@@ -25,18 +25,6 @@
         },
       ],
     }],
-    ['component=="static_library" and use_system_skia==1', {
-      'targets': [
-        {
-          'target_name': 'skia_library',
-          'type': 'none',
-          'includes': [
-            'skia_system.gypi',
-            '../build/android/increase_size_for_speed.gypi',
-          ],
-        },
-      ],
-    }],
     ['component=="static_library"', {
       'targets': [
         {