Small fixes for auto generating 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 112 matching lines @@
           '-g',
           '-fno-exceptions',
           '-fstrict-aliasing',
 
           '-Wall',
           '-Wextra',
           '-Winit-self',
           '-Wpointer-arith',
 
           '-Wno-unused-parameter',
-          '-Wno-c++11-extensions',
         ],
         'cflags_cc': [
           '-fno-rtti',
           '-Wnon-virtual-dtor',
         ],
         'conditions': [
+          [ 'skia_android_framework==0', {
+            'cflags': [
+              # This flag is not supported by Android build system.
+              '-Wno-c++11-extensions',
+            ],
+          }],
           [ 'skia_warnings_as_errors', {
             'cflags': [
               '-Werror',
             ],
           }],
           # For profiling; reveals some costs, exaggerates others (e.g. trivial setters & getters).
           [ 'skia_disable_inlining', {
             'cflags': [
               '-fno-inline',
               '-fno-default-inline',
@@ skipping 361 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',
   },
 }