Update android_make to support both --gcc and --clang options.

gyp/codec.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # GYP file for codec project.
 {
   'targets': [
     {
       'target_name': 'codec',
       'product_name': 'skia_codec',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
         'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
         'libpng.gyp:libpng',
         'libwebp.gyp:libwebp',
       ],
       'cflags':[   
         # FIXME: This gets around a warning: "Argument might be clobbered by longjmp". 
-        '-Wno-clobbered -Wno-error',   
+        '-Wno-clobbered -Wno-error',
       ],
       'include_dirs': [
         '../include/codec',
         '../include/private',
         '../src/codec',
         '../src/core',
         '../src/utils',
       ],
       'sources': [
         '../src/codec/SkAndroidCodec.cpp',
@@ skipping 99 matching lines @@
         }],
         ['skia_os == "chromeos"', {
           'link_settings': {
             'libraries': ['-lrt', ],
           },
         }],
       ],
     },
   ],
 }