New US military budget focused on China despite Trump border talk