Update skia and ui GN builds

base/test/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/android/rules.gni")
 import("//build/config/ui.gni")
 
 source_set("test_support") {
   sources = [
     "expectations/expectation.cc",
@@ skipping 110 matching lines @@
 
   if (is_android) {
     deps += [ ":base_unittests_jni_headers" ]
   }
 }
 
 config("perf_test_config") {
   defines = [ "PERF_TEST" ]
 }
 
-static_library("test_support_perf") {
+source_set("test_support_perf") {
   sources = [
     "run_all_perftests.cc",
   ]
   deps = [
     ":test_support",
     "//base",
     "//testing/gtest",
   ]
 
   direct_dependent_configs = [ ":perf_test_config" ]
 }
 
 source_set("run_all_unittests") {
   sources = [
     "run_all_unittests.cc",
   ]
   deps = [
     ":test_support",
   ]
 }
 
 if (is_android) {
   generate_jni("base_unittests_jni_headers") {
     sources = [
       "android/java/src/org/chromium/base/ContentUriTestUtils.java",
     ]
     jni_package = "base"
   }
 }