Enable runtime checks for SSSE3 on x86 on Android.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 8aa5e0f6bd1c7b1d5048a5278fd295b5b988e01b..ce31756892529003c0bf64378cad3b1789b86c1e 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -33,20 +33,18 @@
       'conditions': [
         [ 'skia_arch_type == "x86" and skia_os != "ios"', {
           'conditions': [
-            [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', {
+            [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', {
               'cflags': [
                 '-msse2',
               ],
             }],
-            [ 'skia_os != "android"', {
-              'dependencies': [
-                'opts_ssse3',
-              ],
-            }],
           ],
           'include_dirs': [
             '../include/utils',
           ],
+          'dependencies': [
+            'opts_ssse3',
+          ],
           'sources': [
             '../src/opts/opts_check_SSE2.cpp',
             '../src/opts/SkBitmapProcState_opts_SSE2.cpp',
@@ -119,7 +117,7 @@
         '../src/core',
       ],
       'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', {
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', {
           'cflags': [
             '-mssse3',
           ],