nanobench: support GMs-as-benches

gyp/bench.gyp

 # GYP file to build performance testbench.
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'bench',
       'type': 'executable',
@@ skipping 19 matching lines @@
       ],
       'includes': [
         'bench.gypi',
         'gmslides.gypi',
       ],
     },
     {
       'target_name': 'nanobench',
       'type': 'executable',
       'sources': [
+        '../bench/GMBench.cpp',
+        '../bench/ResultsWriter.cpp',
         '../bench/nanobench.cpp',
-        '../bench/ResultsWriter.cpp',
       ],
-      'includes': [ 'bench.gypi' ],
+      'includes': [
+        'bench.gypi',
+        'gmslides.gypi',
+      ],
       'dependencies': [
         'flags.gyp:flags_common',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:crash_handler',
         'tools.gyp:timer',
       ],
     },
   ],
 }