Japan extends state of emergency until a month before Olympi