Remove Sk prefix from some bench classes.

bench/BitmapScaleBench.cpp

Index: bench/BitmapScaleBench.cpp
diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp
index 93e10fa43cc04723a15cc5569eaf68e000d136b7..fad741aebc72d3cf6bda55088e8227a903b066ab 100644
--- a/bench/BitmapScaleBench.cpp
+++ b/bench/BitmapScaleBench.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
+#include "SkBlurMask.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
-#include "SkBlurMask.h"
 
-class BitmapScaleBench: public SkBenchmark {
+class BitmapScaleBench: public Benchmark {
     int         fLoopCount;
     int         fInputSize;
     int         fOutputSize;
@@ -79,7 +79,7 @@ protected:
     virtual void doScaleImage() = 0;
     virtual void preBenchSetup() {}
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class BitmapFilterScaleBench: public BitmapScaleBench {