Improve TravisCI build config

Change-Id: I4842d9bfef75df872d0181d657841bd429ec4359