Enable 32/64-bit gyp switch on Android

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
   ],
   'conditions' : [
@@ skipping 173 matching lines @@
           '-Wpointer-arith',
 
           '-Wno-unused-parameter',
         ],
         'cflags_cc': [
           '-fno-rtti',
           '-Wnon-virtual-dtor',
           '-Wno-invalid-offsetof',  # GCC <4.6 is old-school strict about what is POD.
         ],
         'conditions': [
+          [ 'skia_os != "chromeos"', {
+            'conditions': [
+              [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
+                'cflags': [
+                  '-m64',
+                ],
+                'ldflags': [
+                  '-m64',
+                ],
+              }],
+              [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
+                'cflags': [
+                  '-m32',
+                ],
+                'ldflags': [
+                  '-m32',
+                ],
+              }],
+            ],
+          }],
           [ 'skia_android_framework==0', {
             'cflags': [
               # This flag is not supported by Android build system.
               '-Wno-c++11-extensions',
             ],
           }],
           [ 'skia_warnings_as_errors', {
             'cflags': [
               '-Werror',
             ],
@@ skipping 211 matching lines @@
               ],
             },
           }, { # skia_os != "nacl"
             'link_settings': {
               'ldflags': [
                 '-lstdc++',
                 '-lm',
               ],
             },
           }],
-          [ 'skia_os != "chromeos"', {
-            'conditions': [
-              [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
-                'cflags': [
-                  '-m64',
-                ],
-                'ldflags': [
-                  '-m64',
-                ],
-              }],
-              [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
-                'cflags': [
-                  '-m32',
-                ],
-                'ldflags': [
-                  '-m32',
-                ],
-              }],
-            ],
-          }],
           # Enable asan, tsan, etc.
           [ 'skia_sanitizer', {
             'cflags': [
               '-fsanitize=<(skia_sanitizer)',
             ],
             'ldflags': [
               '-fsanitize=<(skia_sanitizer)',
             ],
             'conditions' : [
               [ 'skia_sanitizer == "thread"', {
@@ skipping 241 matching lines @@
         # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
       ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }