eth_type moved outside ethernet header in fabric.p4

Change-Id: I3ae0813c5e8aba48767d5bb235fbbcfb75954010
(cherry picked from commit 693d76f189c59579837b559975c0ba767335dfc0)
diff --git a/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4 b/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
index 89544ea..7348c59 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/forwarding.p4
@@ -84,15 +84,22 @@
     /*
      * IPv4 Routing Table.
      */
+#ifdef WTIH_DEBUG
     direct_counter(CounterType.packets_and_bytes) routing_v4_counter;
+#endif // WITH_DEBUG
 
     action set_next_id_routing_v4(next_id_t next_id) {
         set_next_id(next_id);
+#ifdef WTIH_DEBUG
         routing_v4_counter.count();
+#endif // WITH_DEBUG
     }
 
     action nop_routing_v4() {
+        // no-op
+#ifdef WTIH_DEBUG
         routing_v4_counter.count();
+#endif // WITH_DEBUG
     }
 
     #ifdef _ROUTING_V4_TABLE_ANNOT
@@ -108,7 +115,9 @@
             @defaultonly nop;
         }
         const default_action = nop();
+#ifdef WTIH_DEBUG
         counters = routing_v4_counter;
+#endif // WITH_DEBUG
         size = ROUTING_V4_TABLE_SIZE;
     }