More p4runtime-related bazel build files

Change-Id: Icdd02a06d7905e4cd0a6c61d282fd522c7b75fe7
diff --git a/modules.bzl b/modules.bzl
index d920699..cc809ca 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -104,12 +104,12 @@
     "//drivers/huawei:onos-drivers-huawei-oar",
     "//drivers/microsemi/ea1000:onos-drivers-microsemi-ea1000-oar",
     "//drivers/oplink:onos-drivers-oplink-oar",
-    # "//drivers/bmv2:onos-drivers-bmv2-oar",
-    # "//drivers/barefoot:onos-drivers-barefoot-oar",
-    # "//drivers/mellanox:onos-drivers-mellanox-oar",
+    "//drivers/bmv2:onos-drivers-bmv2-oar",
+    "//drivers/barefoot:onos-drivers-barefoot-oar",
+    "//drivers/mellanox:onos-drivers-mellanox-oar",
     "//drivers/hp:onos-drivers-hp-oar",
-    # "//drivers/p4runtime:onos-drivers-p4runtime-oar",
-    # "//drivers/gnmi:onos-drivers-gnmi-oar",
+    "//drivers/p4runtime:onos-drivers-p4runtime-oar",
+    "//drivers/gnmi:onos-drivers-gnmi-oar",
     "//drivers/polatis/netconf:onos-drivers-polatis-netconf-oar",
     "//drivers/polatis/openflow:onos-drivers-polatis-openflow-oar",
     "//drivers/odtn-driver:onos-drivers-odtn-driver-oar",
@@ -234,8 +234,8 @@
     "//apps/evpn-route-service:onos-apps-evpn-route-service-oar",
     # "//incubator/protobuf/registry:onos-incubator-protobuf-registry-oar",
     # "//incubator/protobuf/services/nb:onos-incubator-protobuf-services-nb-oar",
-    # "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf-oar",
-    # "//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel-oar",
+    "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf-oar",
+    "//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel-oar",
     "//apps/cfm:onos-apps-cfm-oar",
     "//apps/routeradvertisement:onos-apps-routeradvertisement-oar",
     "//apps/powermanagement:onos-apps-powermanagement-oar",
@@ -255,7 +255,7 @@
 PROTOCOL_APPS = [
     "//protocols/grpc:onos-protocols-grpc-oar",
     "//protocols/p4runtime:onos-protocols-p4runtime-oar",
-    # "//protocols/gnmi:onos-protocols-gnmi-oar",
+    "//protocols/gnmi:onos-protocols-gnmi-oar",
     "//protocols/xmpp/core:onos-protocols-xmpp-core-oar",
     "//protocols/xmpp/pubsub:onos-protocols-xmpp-pubsub-oar",
 ]
@@ -294,7 +294,6 @@
     "//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr",
     "//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
     "//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
-    # "//apps/p4runtime-test:onos-apps-p4runtime-test",
     "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     # "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
 ]