Tokyo new virus cases near 2,000 a day before Olympics open