[Merge to 2840] Optimize skia for performance, rather than size on all platforms.

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 336a5432ad89630e7bf2245075b9c85422e42aae..8cb49efd269fb38084bc022ed9522103b2f51dc9 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -515,7 +515,7 @@ component("skia") {
     sources += [ "//third_party/skia/src/pdf/SkDocument_PDF_None.cpp" ]
   }
 
-  if ((is_android || is_win) && !is_debug) {
+  if (!is_debug) {
     configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
@@ -701,7 +701,7 @@ source_set("skia_opts") {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }
 
-  if ((is_android || is_win) && !is_debug) {
+  if (!is_debug) {
     configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }