Japan ending Tokyo virus emergency one month before Olympics