Update skia and ui GN builds

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 9bd47061ad1bc812c02c6af0cf9f36194bebc398..b154e20ed791c37867080aa13587b48bd1bd1bea 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -334,8 +334,8 @@ component("skia") {
       "//third_party/skia/src/ports/SkFontHost_win_dw.cpp",
       "//third_party/skia/src/ports/SkFontMgr_default_gdi.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
+      "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
     ]
   }
   if (!is_android) {
@@ -347,38 +347,19 @@ component("skia") {
   if (!is_mac) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_mac.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
     ]
   }
+
   if (!is_linux) {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
-      "//third_party/skia/src/ports/SkFontHost_linux.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
-    ]
-  } else if (!is_android) {
-    sources -= [
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
-    ]
-  }
-  if (!is_posix) {
-    sources -= [
-      "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
     ]
   }
 
-  sources -= [
-    # This file is a stub for systems that use pthreads but aren't covered by
-    # one of the more specific pthread files. We don't support any such
-    # systems.
-    "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
-  ]
-
   if (!use_cairo) {
     sources -= [
       "ext/bitmap_platform_device_cairo.cc",