Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp

gyp/utils.gyp

Index: gyp/utils.gyp
===================================================================
--- gyp/utils.gyp	(revision 9063)
+++ gyp/utils.gyp	(working copy)
@@ -5,9 +5,6 @@
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'cityhash.gyp:cityhash',
-      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
@@ -64,8 +61,6 @@
         '../src/utils/SkBitSet.h',
         '../src/utils/SkBoundaryPatch.cpp',
         '../src/utils/SkCamera.cpp',
-        '../src/utils/SkCityHash.cpp',
-        '../src/utils/SkCityHash.h',
         '../src/utils/SkCubicInterval.cpp',
         '../src/utils/SkCullPoints.cpp',
         '../src/utils/SkDeferredCanvas.cpp',
@@ -195,16 +190,7 @@
           ],
           'sources!': [
             '../src/utils/SkThreadUtils_pthread_linux.cpp',
-            '../src/utils/SkCityHash.cpp',
-            '../src/utils/SkCityHash.h',
           ],
-          'dependencies!': [
-            # CityHash is not supported on NaCl because the NaCl toolchain is
-            # missing byteswap.h which is needed by CityHash.
-            # TODO(borenet): Find a way to either provide this dependency or
-            # replace it.
-            'cityhash.gyp:cityhash',
-          ],
         }],
         [ 'skia_os == "android"', {
           'sources': [