Fix issues in TravisCI build script

Change-Id: I244bc838c21dca700d48d7fcb8d4f2797291981e