Improve TravisCI build script

Change-Id: I0868ad4ff3248a8be3c2ec997951c34df47f14c0