Trump Hails Revised Nafta Deal, and Sets Up a Showdown With China