Use matrix builds.
Merge pull request #3635 from rjackson/use_matrix_builds

Use matrix builds.