Oil up on strong economic data; U.S.-China tensions cap gains