Updates to gyp files for building Android.mk

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_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)',
   ],
   'conditions' : [
@@ skipping 200 matching lines @@
       'cflags': [
         # Skia does not enforce this usage pattern so we disable it here to avoid
         # unecessary log spew when building
         '-Wno-unused-parameter',
 
         # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkString.
         # Revert to -D_FORTIFY_SOURCE=1
         '-U_FORTIFY_SOURCE',
         '-D_FORTIFY_SOURCE=1',
       ],
+      'cflags!': [
+        '-g',
+        '-march=armv7-a',
+        '-mthumb',
+        '-mfpu=neon',
+        '-mfloat-abi=softfp',
+      ],
       'defines': [
         'DCT_IFAST_SUPPORTED',
         # using freetype's embolden allows us to adjust fake bold settings at
         # draw-time, at which point we know which SkTypeface is being drawn
         'SK_USE_FREETYPE_EMBOLDEN',
         # Android provides at least FreeType 2.4.0 at runtime.
         'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
         # Skia should not use dlopen on Android.
         'SK_CAN_USE_DLOPEN=0',
       ],
@@ skipping 292 matching lines @@
       'defines': [
         'SK_USE_POSIX_THREADS',
       ],
     }],
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }