Various fixes to get a P4Runtime demo that works

Change-Id: Icab512fceeb6ec0faf1b402c1e325e055cdb2caf
diff --git a/drivers/bmv2/BUCK b/drivers/bmv2/BUCK
index b7de8b4..15f6dcf 100644
--- a/drivers/bmv2/BUCK
+++ b/drivers/bmv2/BUCK
@@ -28,6 +28,7 @@
     included_bundles = BUNDLES,
     required_apps = [
         'org.onosproject.generaldeviceprovider',
-        'org.onosproject.protocols.p4runtime'
+        'org.onosproject.protocols.p4runtime',
+        'org.onosproject.p4runtime',
     ],
 )