Unify most of our utf8 implementations. This takes the implementation

runtime/bin/bin.gypi

Index: runtime/bin/bin.gypi
===================================================================
--- runtime/bin/bin.gypi	(revision 4630)
+++ runtime/bin/bin.gypi	(working copy)
@@ -7,7 +7,7 @@
     'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc',
     'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc',
     'uri_cc_file': '<(SHARED_INTERMEDIATE_DIR)/uri_gen.cc',
-    'utf8_cc_file': '<(SHARED_INTERMEDIATE_DIR)/utf8_gen.cc',
+    'utf_cc_file': '<(SHARED_INTERMEDIATE_DIR)/utf_gen.cc',
     'builtin_in_cc_file': 'builtin_in.cc',
     'builtin_cc_file': '<(SHARED_INTERMEDIATE_DIR)/builtin_gen.cc',
     'snapshot_in_cc_file': 'snapshot_in.cc',
@@ -157,7 +157,7 @@
       ]
     },
     {
-      'target_name': 'generate_utf8_cc_file',
+      'target_name': 'generate_utf_cc_file',
       'type': 'none',
       'conditions': [
         ['OS=="win"', {
@@ -165,29 +165,29 @@
         }],
       ],
       'includes': [
-        'utf8_sources.gypi',
+        'utf_sources.gypi',
       ],
       'actions': [
         {
-          'action_name': 'generate_utf8_cc',
+          'action_name': 'generate_utf_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
-            '<(utf8_cc_file)',
+            '<(utf_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
-            '--output', '<(utf8_cc_file)',
+            '--output', '<(utf_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
-            '--var_name', 'Builtin::utf8_source_',
+            '--var_name', 'Builtin::utf_source_',
             '<@(_sources)',
           ],
-          'message': 'Generating ''<(utf8_cc_file)'' file.'
+          'message': 'Generating ''<(utf_cc_file)'' file.'
         },
       ]
     },
@@ -199,7 +199,7 @@
         'generate_io_cc_file',
         'generate_json_cc_file',
         'generate_uri_cc_file',
-        'generate_utf8_cc_file',
+        'generate_utf_cc_file',
       ],
       'include_dirs': [
         '..',
@@ -266,7 +266,7 @@
         '<(io_cc_file)',
         '<(json_cc_file)',
         '<(uri_cc_file)',
-        '<(utf8_cc_file)',
+        '<(utf_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -353,7 +353,7 @@
         '<(io_cc_file)',
         '<(json_cc_file)',
         '<(uri_cc_file)',
-        '<(utf8_cc_file)',
+        '<(utf_cc_file)',
         'snapshot_empty.cc',
       ],
       'conditions': [