Return after prison sentence: Trump taps Navarro as trade, manufacturing counselor