This will eliminate one of the builds in Travis, allowing for CI overall to complete faster. (cherry picked from commit 993d4b34)