Compile specific parts of the Android build with -O2.

skia/skia_library_opts.gyp

Index: skia/skia_library_opts.gyp
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
index 821168bc0326bbb75b1c8bed94b0591710c18586..da6d0ac1d1e01729ea36766be7be79bb38eb4824 100644
--- a/skia/skia_library_opts.gyp
+++ b/skia/skia_library_opts.gyp
@@ -5,6 +5,18 @@
 
 # This gyp file contains the platform-specific optimizations for Skia
 {
+  'target_defaults': {
+    'configurations': {
+      'Release': {
+        'conditions': [
+          ['OS=="android"', {
+            'cflags!': ['-Os'],
+            'cflags': ['-O2'],
+          }],
+        ],
+      },
+    },
+  },
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The