Make mojo_system static and mojo_system_impl a component, never use both

mojo/mojo_public.gypi

Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 261170a9822d2bb461de9e11eb3423e132bbf66e..98acd0d90376a235696bd8bc2a7343b1ebe2b187 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -2,7 +2,7 @@
   'targets': [
     {
       'target_name': 'mojo_system',
-      'type': '<(component)',
+      'type': 'static_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
@@ -19,8 +19,8 @@
         'public/c/system/core.h',
         'public/c/system/macros.h',
         'public/c/system/system_export.h',
-        'public/system/core_private.cc',
-        'public/system/core_private.h',
+        'public/platform/native/mojo_core.cc',
+        'public/platform/native/mojo_core.h',
       ],
       'conditions': [
         ['OS=="mac"', {
@@ -120,7 +120,6 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system',
         'mojo_test_support',
       ],
       'sources': [
@@ -139,7 +138,7 @@
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
         'mojo_sample_service',
-        'mojo_system',
+        'mojo_system_impl',
         'mojo_utility',
       ],
       'sources': [
@@ -171,7 +170,6 @@
         'mojo_environment_standalone',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -187,7 +185,7 @@
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
+        'mojo_system_impl',
       ],
       'sources': [
         'public/c/system/tests/core_unittest.cc',
@@ -206,7 +204,6 @@
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -232,7 +229,6 @@
         '../testing/gtest.gyp:gtest',
         'mojo_public_test_utils',
         'mojo_run_all_perftests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -301,11 +297,9 @@
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
     },
     {
@@ -366,7 +360,6 @@
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'export_dependent_settings': [
         'mojo_bindings',