Fix extra toP4 whitespace

[fruffy]

Fixes toP4's extra whitespace that is added at the end of the program and after annotations. This PR changes lots of files, spot checking will be necessary.

[jafingerhut]

I looked over the changed test programs in the p4_16_samples directory of this PR. It appears that basically these test programs included v1model.p4, but were not written to use the v1model architecture, and your changes modify them so that they do use the v1model architecture.

I did not carefully check the original reason that these test programs were written. It would be good if we did not unintionally change the reason they were created, and what cases within the compiler's implementation that they cover. If these changes did happen to do that, another possible change to the test program would be to no longer include the v1model.p4 file.

[fruffy]

I chose to make them complete v1model programs to add more test cases for the behavioral model (still missing the extension). However, just removing the include also works. I will also move those files to a separate PR since the diff has blown up.

[fruffy]

Migrated the test file cleanup to #3608.