Trump threatens tariffs on cars from Mexico, stays optimistic on China deal