Update skia and ui GN builds

tools/gn/secondary/chrome/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/grit_rule.gni")
 
 executable("chrome") {
   sources = [
@@ skipping 45 matching lines @@
   }
 
   if (!is_win) {
     sources -= [
       "app/client_util.cc",
       "app/client_util.h",
     ]
   }
 }
 
-static_library("browser") {
+source_set("browser") {
   if (is_linux) {
     configs += [
       "//build/config/linux:x11",
     ]
   }
 
   deps = [
     "//third_party/expat",
   ]
 }
 
-static_library("common") {
+source_set("common") {
   if (!use_openssl && is_linux) {
     # common/net uses NSS.
     # TODO(brettw) have a better way to express this without having to do
     # "if (use_nss)" everywhere.
     configs += [ "//third_party/nss:nss_linux_config" ]
   }
   deps = [
   ]
 }
 
@@ skipping 201 matching lines @@
 #}
 #grit("translate_internals_resources") {
 #  source = "browser/resources/translate_internals_resources.grd"
 #}
 #
 ## TODO(brettw) rename "app_theme_resources" or something when we don't support
 ## GYP any more. This name is required to match the GYP build.
 #grit("theme_resources") {
 #  source = "app/theme/theme_resources.grd"
 #}