This reverts commit 71e9bd6f.

* Upgrade everything except matcher.
* Roll matcher (and test)
* Adjust tests that depend on flutter:test directly to depend on a shim
* Require use of package:test shim and remove other references to package:test

Fixes some tests that weren't aggressively catching exceptions.
Fixes some actual failures that were found because of this.
Tries to fix an intermittent failure with crash1_test.dart which could be a race condition.