Revert of DevTools: Avoid build errors when dynamic module and application names clash

Source/devtools/devtools.gypi

Index: Source/devtools/devtools.gypi
diff --git a/Source/devtools/devtools.gypi b/Source/devtools/devtools.gypi
index 4699a6722304bae4c7fe7e5eafd39040942c1b36..25bb99e144898e797f24a2dcee96bb4ee5631d5b 100644
--- a/Source/devtools/devtools.gypi
+++ b/Source/devtools/devtools.gypi
@@ -40,7 +40,6 @@
             '<@(devtools_components_js_files)',
             '<@(devtools_core_base_files)',
             '<@(devtools_host_js_files)',
-            '<@(devtools_main_js_files)',
             '<@(devtools_screencast_js_files)',
             '<@(devtools_sdk_js_files)',
             '<@(devtools_toolbox_bootstrap_js_files)',
@@ -65,6 +64,7 @@
             'front_end/splitView.css',
             'front_end/suggestBox.css',
             'front_end/tabbedPane.css',
+            '<@(devtools_main_js_files)',
             '<@(devtools_standalone_files)',
         ],
         'devtools_common_js_files': [
@@ -453,6 +453,7 @@
             'front_end/cm/xml.js',
             'front_end/common/WebInspector.js',
             'front_end/common/utilities.js',
+            'front_end/common/utilities.js',
             'front_end/script_formatter_worker/CSSFormatter.js',
             'front_end/script_formatter_worker/JavaScriptFormatter.js',
             'front_end/script_formatter_worker/ScriptFormatterWorker.js',
@@ -574,7 +575,6 @@
             '<@(devtools_promises_js_files)',
             '<@(devtools_resources_js_files)',
             '<@(devtools_script_formatter_worker_js_files)',
-            '<@(devtools_settings_js_files)',
             '<@(devtools_source_frame_js_files)',
             '<@(devtools_sources_js_files)',
             '<@(devtools_temp_storage_shared_worker_js_files)',