Move BenchTimer to tools as Timer

gyp/gm.gyp

Index: gyp/gm.gyp
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 0b0054b7018072eb41c59808809c04fd05bce0da..fd56e7eebef52890c848bc266fe7108de816662c 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -5,28 +5,6 @@
   ],
   'targets': [
     {
-      'target_name': 'gm_expectations',
-      'type': 'static_library',
-      'include_dirs' : [
-        '../src/utils/',
-      ],
-      'sources': [
-        '../gm/gm_expectations.h',
-        '../gm/gm_expectations.cpp',
-        '../tools/sk_tool_utils.cpp',
-      ],
-      'dependencies': [
-        'crash_handler.gyp:CrashHandler',
-        'jsoncpp.gyp:jsoncpp',
-        'skia_lib.gyp:skia_lib',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../gm/',
-        ],
-      },
-    },
-    {
       'target_name': 'gm',
       'type': 'executable',
       'include_dirs' : [
@@ -49,11 +27,12 @@
       'dependencies': [
         'etc1.gyp:libetc1',
         'flags.gyp:flags',
-        'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'pdf.gyp:pdf',
-        'resources.gyp:resources',
         'skia_lib.gyp:skia_lib',
+        'tools.gyp:crash_handler',
+        'tools.gyp:gm_expectations',
+        'tools.gyp:resources',
       ],
       'conditions': [
         ['skia_android_framework', {