Trump signs tax, short-term spending bills into law