Revert of extract some common code from PictureRenderer

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',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'jsoncpp.gyp:jsoncpp',
-        'utils.gyp:utils',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../gm/',
         ],
       },
     },
     {
       'target_name': 'gm',
       'type': 'executable',
@@ skipping 70 matching lines @@
             '../src/gpu',
           ],
           'dependencies': [
             'gputest.gyp:skgputest',
           ],
         }],
       ],
     },
   ],
 }