Consolidate imports and deps entries in skia/BUILD.gn.

Change-Id: I6d2cc26c552a6f9947ebbc19066304446a9e3a44
Reviewed-on: https://chromium-review.googlesource.com/1235342Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592843}

skia/BUILD.gn

@@ -6,10 +6,11 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/freetype/freetype.gni")
 import("//build/config/sanitizers/sanitizers.gni")
+import("//gpu/vulkan/features.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
-import("//gpu/vulkan/features.gni")
+import("//third_party/skia/third_party/skcms/skcms.gni")
 
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
@@ -235,7 +236,6 @@ config("skia_library_config") {
   }
 }
 
-import("//third_party/skia/third_party/skcms/skcms.gni")
 source_set("skcms") {
   cflags = []
   if (!is_win || is_clang) {
@@ -527,6 +527,7 @@ component("skia") {
   public_configs = [ ":skia_config" ]
 
   deps += [
+    ":skcms",
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
@@ -602,9 +603,6 @@ component("skia") {
   if (is_fuchsia) {
     deps += [ "//third_party/expat" ]
   }
-
-  # skcms
-  deps += [ ":skcms" ]
 }
 
 # Template for things that are logically part of :skia, but need to be split out