Revert of Move BenchTimer to tools as Timer

gyp/gm.gyp

 # GYP file to build the "gm" (golden master) executable.
 {
   'includes': [
     'apptype_console.gypi',
   ],
   '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' : [
         '../src/core',
         '../src/effects',
         '../src/images',
         '../src/pipe/utils',
         '../src/utils',
       ],
       'includes': [
         'gmslides.gypi',
       ],
       'sources': [
         '../gm/gmmain.cpp',
         '../gm/system_preferences_default.cpp',
 
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       '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', {
           'libraries': [
             '-lskia',
           ],
         }],
         ['skia_run_pdfviewer_in_gm or skia_poppler_enabled', {
           'sources': [
             '../src/utils/SkPDFRasterizer.cpp',
@@ skipping 42 matching lines @@
             '../src/gpu',
           ],
           'dependencies': [
             'gputest.gyp:skgputest',
           ],
         }],
       ],
     },
   ],
 }