Update config settings by config-updater.

Change-Id: Iaa5f115752c913cd8de20479098cfae00f3b89c0
diff --git a/config/config_dump.json b/config/config_dump.json
index 9be8592..fa7b78d 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -7736,7 +7736,7 @@
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blacktip360\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blacktiplte\",\n    \"test_suites\": [\n        \"sanity\",\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-installer\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blue\",\n    \"test_suites\": [\n        \"au\"\n    ]\n}",
-            "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"bruce\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
+            "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"bruce\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"epaulette\",\n    \"test_suites\": []\n}",
             "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"lava\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"nasher\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
@@ -7777,7 +7777,7 @@
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blacktip360\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blacktiplte\",\n    \"test_suites\": [\n        \"sanity\",\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-installer\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"blue\",\n    \"test_suites\": [\n        \"au\"\n    ]\n}",
-            "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"bruce\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
+            "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"bruce\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\"\n    ]\n}",
             "{\n    \"enable_skylab\": false,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"epaulette\",\n    \"test_suites\": []\n}",
             "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"lava\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
             "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"coral\",\n    \"name\": \"nasher\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-tast-cq\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"bvt-tast-informational\"\n    ]\n}",
@@ -13227,11 +13227,6 @@
         "boards": [
             "flapjack"
         ],
-        "models": [
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"c18\",\n    \"test_suites\": []\n}",
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"c19\",\n    \"test_suites\": []\n}",
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"flapjack\",\n    \"test_suites\": []\n}"
-        ],
         "sign_types": [
             "recovery",
             "factory"
@@ -13257,11 +13252,6 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
-        "models": [
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"c18\",\n    \"test_suites\": []\n}",
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"c19\",\n    \"test_suites\": []\n}",
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"flapjack\",\n    \"name\": \"flapjack\",\n    \"test_suites\": []\n}"
-        ],
         "paygen": false,
         "push_image": false,
         "sign_types": [
@@ -20560,7 +20550,6 @@
             "fizz-cfm-release",
             "fizz-moblab-release",
             "fizz-release",
-            "flapjack-release",
             "gale-release",
             "gandof-release",
             "gnawty-release",
@@ -20687,7 +20676,6 @@
             "fizz-cfm-release-tryjob",
             "fizz-moblab-release-tryjob",
             "fizz-release-tryjob",
-            "flapjack-release-tryjob",
             "gale-release-tryjob",
             "gandof-release-tryjob",
             "gnawty-release-tryjob",
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index c1a37a5..230c72c 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -1080,11 +1080,7 @@
           "name": "bruce",
           "test_suites": [
             "bvt-inline",
-            "bvt-tast-cq",
-            "bvt-arc",
-            "bvt-cq",
-            "bvt-perbuild",
-            "bvt-tast-informational"
+            "bvt-tast-cq"
           ],
           "cq_test_enabled": false,
           "release_builder_test_pool": "bvt",
@@ -1438,39 +1434,6 @@
       ]
     },
     {
-      "name": "flapjack",
-      "reference_board_name": "flapjack",
-      "arch": "UNKNOWN",
-      "builder": "RELEASE",
-      "experimental": false,
-      "models": [
-        {
-          "board_name": "flapjack",
-          "name": "c18",
-          "cq_test_enabled": false,
-          "release_builder_test_pool": "bvt",
-          "board_id": 374,
-          "is_active": true
-        },
-        {
-          "board_name": "flapjack",
-          "name": "c19",
-          "cq_test_enabled": false,
-          "release_builder_test_pool": "bvt",
-          "board_id": 374,
-          "is_active": true
-        },
-        {
-          "board_name": "flapjack",
-          "name": "flapjack",
-          "cq_test_enabled": false,
-          "release_builder_test_pool": "bvt",
-          "board_id": 374,
-          "is_active": true
-        }
-      ]
-    },
-    {
       "name": "grunt",
       "reference_board_name": "grunt",
       "arch": "X86_INTERNAL",
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 9279c41..fa81192 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -273,7 +273,6 @@
     fizz-cfm-release
     fizz-moblab-release
     fizz-release
-    flapjack-release
     gale-release
     gandof-release
     gnawty-release
@@ -1284,7 +1283,6 @@
     fizz-cfm-release-tryjob
     fizz-moblab-release-tryjob
     fizz-release-tryjob
-    flapjack-release-tryjob
     gale-release-tryjob
     gandof-release-tryjob
     gnawty-release-tryjob