Re-enable 1 or 2 more macOS jobs in Travis

Reverts #32177 (moved).

We might need to merge or disable some jobs, to get builds to finish fast enough.