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/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index 38ba91b..7f36d47 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -17,7 +17,7 @@
 BUILD_DIR=~/p4tools
 BMV2_COMMIT="4eeb8dad8e8f062636f9d0d8296aa7f288c6f6dd"
 PI_COMMIT="9fc50cd0a0187eb1346272524d4b8bafb51bb513"
-P4C_COMMIT="55067fd0e5f9e25fef06e58e49033da3493f796d"
+P4C_COMMIT="040b931fbfcb7912e3a14cd05df950fbdd49b038"
 PROTOBUF_COMMIT="tags/v3.0.2"
 GRPC_COMMIT="tags/v1.3.0"