20160617 sports.tennis: Nadal set for Toronto return before Olympics