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

tools/android/SkAndroidSDKCanvas.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkAndroidSDKCanvas_DEFINED
 #define SkAndroidSDKCanvas_DEFINED
 
@@ skipping 54 matching lines @@
     void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                         const SkPaint& paint) override;
 
     void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
                      const SkPoint texCoords[4], SkXfermode* xmode,
                      const SkPaint& paint) override;
 
     void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
     void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
                          SrcRectConstraint) override;
-    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
     void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[],
                      const SkColor[], int count, SkXfermode::Mode,
                      const SkRect* cull, const SkPaint*) override;
     void onDrawImageNine(const SkImage*, const SkIRect& center,
                          const SkRect& dst, const SkPaint*) override;
 
     // PASS THROUGH
 
     void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     SkISize getBaseLayerSize() const override;
@@ skipping 15 matching lines @@
     void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipRegion(const SkRegion&, SkRegion::Op) override;
     void onDiscard() override;
 
 protected:
     SkCanvas* fProxyTarget;
 };
 
 #endif  // SkAndroidSDKCanvas_DEFINED