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

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index c0b901eb000db249b29c644c728e1981b6279591..df12c433bb34d49d64b7a0977e8858ded197ba7e 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -655,6 +655,14 @@
           [ 'skia_profile_enabled == 1', {
             'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
           }],
+          [ 'skia_clang_build', {
+            'cflags': [
+                # These flags that are on by default for only the android
+                # toolchain and no other platforms.
+                '-Wno-tautological-compare',
+                '-Wno-unused-command-line-argument',
+            ],
+          }],
         ],
       },
     ],