U.S. trade deficit narrows, including gap with China