Canada ships more oil to China as U.S. threatens trade