Stop adding mssse3 & m32/m64 for Android framework.

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_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
   ],
   'conditions' : [
@@ skipping 209 matching lines @@
         ],
         'cflags_cc': [
           '-std=c++11',
           '-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_type == "x86_64"', {
+              [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
                 'cflags': [
                   '-m64',
                 ],
                 'ldflags': [
                   '-m64',
                 ],
               }],
-              [ 'skia_arch_type == "x86"', {
+              [ 'skia_arch_type == "x86" and not skia_android_framework', {
                 'cflags': [
                   '-m32',
                 ],
                 'ldflags': [
                   '-m32',
                 ],
               }],
             ],
           }],
           [ 'skia_warnings_as_errors', {
@@ skipping 380 matching lines @@
         ],
         'conditions': [
           [ '"x86" in skia_arch_type', {
             'cflags': [
               '-mssse3',
             ],
           }],
           [ 'skia_android_framework', {
             'cflags!': [
               '-fuse-ld=gold',
+              '-mssse3',
             ],
           }],
           [ 'skia_shared_lib', {
             'defines': [
               'SKIA_DLL',
               'SKIA_IMPLEMENTATION=1',
               # Needed until we fix skbug.com/2440.
               'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
             ],
           }],
           [ 'skia_profile_enabled == 1', {
             'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
           }],
         ],
       },
     ],
 
     [ 'skia_moz2d', {
       'defines': [
         # 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',
   },
 }