Change the name of SkFlags to SkCommandLineFlags.

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 80 matching lines @@
         '../tools/render_pictures_main.cpp',
       ],
       'include_dirs': [
         '../src/pipe/utils/',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
         'ports.gyp:ports',
+        'flags.gyp:flags',
       ],
     },
     {
       'target_name': 'bench_pictures',
       'type': 'executable',
       'sources': [
         '../bench/SkBenchLogger.h',
         '../bench/SkBenchLogger.cpp',
         '../bench/TimerData.h',
         '../bench/TimerData.cpp',
         '../tools/bench_pictures_main.cpp',
         '../tools/PictureBenchmark.cpp',
       ],
       'include_dirs': [
         '../bench',
         '../src/lazy/',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
         'tools.gyp:picture_utils',
         'tools.gyp:picture_renderer',
         'bench.gyp:bench_timer',
         'ports.gyp:ports',
+        'flags.gyp:flags',
       ],
     },
     {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
         '../tools/PictureRenderer.h',
         '../tools/PictureRenderer.cpp',
         '../tools/PictureRenderingFlags.h',
         '../tools/PictureRenderingFlags.cpp',
@@ skipping 151 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: