(More) Travis CI updates

Change-Id: I8d36dbff516abe6297d225b80502d9dac07cd0ff