Fix issues with new TravisCI build config

Change-Id: I2304999d5bacb6a337b45cd6963fe477562d0beb