Update TravisCI build matrix

Change-Id: I94a5c464a90e8be26b49cd98b967aea48356fc06