Fix up -Winconsistent-missing-override

  (and a couple presubmit fixes)

This allows us to turn back on -Werror for LLVM coverage builds,
and more generally supports building with Clang 3.7.

No public API changes.
TBR=reed@google.com

BUG=skia:

Review URL: https://codereview.chromium.org/1232463006

1 files changed, 2 insertions, 2 deletions

diff --git a/bench/TextBlobBench.cpp b/bench/TextBlobBench.cpp
index ae71a1e41a..f830001ea9 100644
--- a/bench/TextBlobBench.cpp
+++ b/bench/TextBlobBench.cpp
@@ -50,11 +50,11 @@ protected:
         fBlob.reset(builder.build());
     }
 
-    const char* onGetName() {
+    const char* onGetName() override {
         return "TextBlobBench";
     }
 
-    void onDraw(const int loops, SkCanvas* canvas) {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkPaint paint;
 
         // To ensure maximum caching, we just redraw the blob at the same place everytime