Set SkColorSpace object for PNGs and parse ICC profiles

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index e60879bc5c0566991fb708e37a2d389ce322ac15..49e441b9e237ba0c63064216437f4d243b55d495 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -264,19 +264,19 @@
       ],
     },
     {
-        'target_name': 'get_images_from_skps',
-        'type': 'executable',
-        'sources': [
-            '../tools/get_images_from_skps.cpp',
-         ],
-         'include_dirs': [
-             '../include/private',
-             '../src/core',
-         ],
-         'dependencies': [
-            'flags.gyp:flags',
-            'skia_lib.gyp:skia_lib',
-         ],
+      'target_name': 'get_images_from_skps',
+      'type': 'executable',
+      'sources': [
+        '../tools/get_images_from_skps.cpp',
+      ],
+      'include_dirs': [
+        '../src/core',
+        '../include/private',
+      ],
+      'dependencies': [
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+      ],
     },
     {
       'target_name': 'gpuveto',
@@ -469,6 +469,7 @@
       },
       'include_dirs': [
         '<@(includes_to_test)',
+        '../src/core',
       ],
       'sources': [
         # unused_param_test.cpp is generated by the action below.