Improve the travis configuration.

Change-Id: I4962b616dcfca617b841687d283d1e7c9c91577d