Improve fabric.p4 with BNG support

Change-Id: I08f8991d8cf432785e0c409354b6301c8983bfb4
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 2311b11..39698a3 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -1324,7 +1324,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 260,
+        "line" : 261,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -3223,7 +3223,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 142,
+            "line" : 143,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3309,7 +3309,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 144,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -3335,7 +3335,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 141,
+            "line" : 142,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -3626,7 +3626,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 125,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -3782,7 +3782,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 137,
+            "line" : 138,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3801,7 +3801,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 121,
+            "line" : 122,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4235,7 +4235,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 152,
+            "line" : 153,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -4653,7 +4653,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 148,
+            "line" : 149,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }