According to Kanzentai and Happinet, Dragon Ball Kai will have a total of 99 planned episodes. Seeing how the Freeza arc will end around episode 50, it is safe to assume the Android and Buu sagas will be included in Dragon Ball Kai. This basically debunks a recent rumor saying DB Kai will end after the Freeza saga.