Fuse skgr & gr targets in gyp files

https://codereview.chromium.org/17101010/



git-svn-id: http://skia.googlecode.com/svn/trunk@9653 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/skia_lib.gyp b/gyp/skia_lib.gyp
index f85c5ad..d4cd00e 100644
--- a/gyp/skia_lib.gyp
+++ b/gyp/skia_lib.gyp
@@ -24,8 +24,7 @@
       }],
       [ 'skia_gpu', {
         'component_libs': [
-          'gpu.gyp:gr',
-          'gpu.gyp:skgr',
+          'gpu.gyp:skgpu',
         ],
       }],
       [ 'skia_os == "nacl"', {