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

gyp/cityhash.gyp

+# Do-nothing gypfile, to keep the buildbots green.
+# See https://code.google.com/p/skia/issues/detail?id=1286
+# ('removing cityhash.gyp broke SOME but not ALL buildbots')
 {
-  'variables': {
-    'skia_warnings_as_errors': 0,
-  },
-  'targets': [
-    {
-      'target_name': 'cityhash',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../src/utils/cityhash',
-        '../third_party/externals/cityhash/src',
-      ],
-      'sources': [
-        '../third_party/externals/cityhash/src/city.cc',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/cityhash/src',
-        ],
-      },
-      'conditions': [
-        [ 'skia_os == "android"', {
-          'cflags!': [
-            '-Wall',
-          ],
-        }],
-      ],
-    },
-  ],
 }