Kipchoge in Kenyan marathon team for Tokyo Olympics