Zimbabwe prime minister Tsvangirai ends cabinet boycott