Fuse skgr & gr targets in gyp files

gyp/skia_lib.gyp

 # The minimal set of static libraries for basic Skia functionality.
 
 {
   'variables': {
     'component_libs': [
       'core.gyp:core',
       'effects.gyp:effects',
       'images.gyp:images',
       'opts.gyp:opts',
       'ports.gyp:ports',
       'sfnt.gyp:sfnt',
       'utils.gyp:utils',
     ],
     'conditions': [
       [ 'skia_arch_type == "x86" and skia_os != "android"', {
         'component_libs': [
           'opts.gyp:opts_ssse3',
         ],
       }],
       [ 'arm_neon == 1', {
         'component_libs': [
           'opts.gyp:opts_neon',
         ],
       }],
       [ 'skia_gpu', {
         'component_libs': [
-          'gpu.gyp:gr',
-          'gpu.gyp:skgr',
+          'gpu.gyp:skgpu',
         ],
       }],
       [ 'skia_os == "nacl"', {
         'component_libs': [
           'freetype.gyp:freetype',
         ],
       }],
     ],
   },
   'targets': [
@@ skipping 24 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: