Fix issues with TravisCI build config

Change-Id: Iaed894c5a27efa5dce4718575746677ec47e4b27