Update Travis CI config to handle already upgraded xctool