More tweaks to osx android on travis