Revert of Move BenchTimer to tools as Timer

tools/PictureBenchmark.h

Index: tools/PictureBenchmark.h
diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 1ddd18ea16358634a19c31fd625983402d976082..142d52685e0e8b161b1de470786ac54b82cd41eb 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -13,8 +13,8 @@
 #include "SkTypes.h"
 #include "TimerData.h"
 
+class BenchTimer;
 class SkPicture;
-class Timer;
 
 namespace sk_tools {
 
@@ -67,7 +67,7 @@
 
     PictureResultsWriter* fWriter;
 
-    Timer* setupTimer(bool useGLTimer = true);
+    BenchTimer* setupTimer(bool useGLTimer = true);
 };
 
 }