Update travis to work with changes to the android setup on travis ci