Improvements to TravisCI build config

Change-Id: I3f9faa31caeba42457c28690596af5e193833cb4