Update from https://crrev.com/316786

gpu/config/BUILD.gn

Index: gpu/config/BUILD.gn
diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn
index be7a444d5cb5812045e611216cdb02751115a344..1d86e69cb8db3cdde735c48fdf0d7d0f6bd00e83 100644
--- a/gpu/config/BUILD.gn
+++ b/gpu/config/BUILD.gn
@@ -15,17 +15,19 @@ source_set("config") {
     "dx_diag_node.h",
     "gpu_blacklist.cc",
     "gpu_blacklist.h",
-    "gpu_control_list_jsons.h",
     "gpu_control_list.cc",
     "gpu_control_list.h",
-    "gpu_driver_bug_list_json.cc",
+    "gpu_control_list_jsons.h",
     "gpu_driver_bug_list.cc",
     "gpu_driver_bug_list.h",
+    "gpu_driver_bug_list_json.cc",
     "gpu_driver_bug_workaround_type.h",
     "gpu_dx_diagnostics_win.cc",
     "gpu_feature_type.h",
     "gpu_info.cc",
     "gpu_info.h",
+    "gpu_info_collector.cc",
+    "gpu_info_collector.h",
     "gpu_info_collector_android.cc",
     "gpu_info_collector_linux.cc",
     "gpu_info_collector_linux.h",
@@ -33,8 +35,6 @@ source_set("config") {
     "gpu_info_collector_ozone.cc",
     "gpu_info_collector_win.cc",
     "gpu_info_collector_x11.cc",
-    "gpu_info_collector.cc",
-    "gpu_info_collector.h",
     "gpu_performance_stats.h",
     "gpu_test_config.cc",
     "gpu_test_config.h",