Merge "Fix run-test --trace option if --host is specified after."