Update from https://crrev.com/312398

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 7d4fb3e11f12904c653593835546a6565b50e52e..4ddce5e0642a6318cacaf7b4ff6c656424330a17 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -4,12 +4,10 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//testing/test.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
 
 skia_support_gpu = !is_ios
 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview)
@@ -479,6 +477,11 @@ component("skia") {
       "ext/bitmap_platform_device_mac.cc",
       "ext/bitmap_platform_device_mac.h",
     ]
+  } else if (use_cairo) {
+    sources += [
+      "ext/bitmap_platform_device_cairo.cc",
+      "ext/bitmap_platform_device_cairo.h",
+    ]
   } else {
     sources += [
       "ext/bitmap_platform_device_skia.cc",
@@ -519,6 +522,7 @@ component("skia") {
     configs += [
       "//build/config/linux:fontconfig",
       "//build/config/linux:freetype2",
+      "//build/config/linux:pangocairo",
     ]
     deps += [ "//third_party/icu:icuuc" ]
   }
@@ -727,13 +731,3 @@ test("skia_unittests") {
     "//ui/gfx/geometry",
   ]
 }
-
-if (is_android) {
-  # GYP: //skia/skia_tests.gyp:skia_unittests_apk
-  unittest_apk("skia_unittests_apk") {
-    unittests_dep = ":skia_unittests"
-    deps = [
-      ":skia_unittests",
-    ]
-  }
-}