Hideki Matsuyama birdied the 17th and saved par on his final hole for a 7-under 64, leaving him two shots behind leader Xander Schauffele after the second round at the Tokyo Olympics.