fix(travis): fixes from the third_party.go merge