Remove extra Mac CPU jobs.

This is a followup to
https://skia-review.googlesource.com/c/skia/+/145431

Also clean up old job names in recipe expectations.

No-Try: true
Change-Id: Ic63a64a98fb39076680941bb2415b7bb64415179
Reviewed-on: https://skia-review.googlesource.com/148671
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
7 files changed