Trump says Mexico, Canada tariffs now set for April 2