Tweak Travis CI build config

Change-Id: Iaaaa65047780dcca1c7528ddfb057864f3acdcd7