ONOS-7058 Refactored default pipeconfs in new pipelines directory

- Minimal refactoring of P4 programs
- Removed symlinks to BMv2 JSON/P4Info
- Bumped p4c commit (which fixes known parser bug)
- Renamed "default" pipeconf to "basic" (ONOS-6818)

Change-Id: I319f8b142ab22dba9b15457e28cd62d17f78a423
diff --git a/modules.defs b/modules.defs
index 5ea50a2..b6c61e9 100644
--- a/modules.defs
+++ b/modules.defs
@@ -243,6 +243,10 @@
     '//models/polatis:onos-models-polatis-oar',
 ]
 
+PIPELINES = [
+    '//pipelines/basic:onos-pipelines-basic-oar',
+]
+
 APP_JARS = [
     '//apps/cpman/api:onos-apps-cpman-api',
     '//apps/routing-api:onos-apps-routing-api',
@@ -259,5 +263,6 @@
 #   '//apps/p4runtime-test:onos-apps-p4runtime-test',
 ]
 
-APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PROTOCOL_APPS
+APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PIPELINES \
+        + PROTOCOL_APPS