Bumped supported revisions of P4 tools

Includes:
- Use new P4Runtime "v1" package names
- Removed VALID match
- New table entry priority spec (1 is min priority, not 0)
- Fixed p4c-bm2-ss to include arch flag
- Re-compiled P4 programs with more recent p4c (with updated p4info)

Change-Id: I05908f40eda0f0c755009268fd261fb8bcc9be35
diff --git a/pipelines/basic/src/main/resources/Makefile b/pipelines/basic/src/main/resources/Makefile
index 1c48156..ca8430b 100644
--- a/pipelines/basic/src/main/resources/Makefile
+++ b/pipelines/basic/src/main/resources/Makefile
@@ -1,15 +1,14 @@
 all: basic int
 
 basic: basic.p4
-	p4c-bm2-ss -o p4c-out/bmv2/basic.json \
+	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/basic.json \
 		--p4runtime-file p4c-out/bmv2/basic.p4info \
 		--p4runtime-format text basic.p4
 
 int: int.p4
-	p4c-bm2-ss -o p4c-out/bmv2/int.json \
+	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/int.json \
 		--p4runtime-file p4c-out/bmv2/int.p4info \
 		--p4runtime-format text int.p4
 
 clean:
-	rm -rf p4c-out/bmv2/*.json
-	rm -rf p4c-out/bmv2/*.p4info
+	rm -rf p4c-out/bmv2/*