Revert "Improve TravisCI build script"

This reverts commit 90433be5ce09f5d56dc21c32d2fe6d6167c46ac3

Change-Id: I26227bee8b87884c055eca0ef9462dc7bb24ade5