Improve travis config

Change-Id: I146712d1e531022767a1c8afbfbd670b3949f3a8