am 0346b6be: Merge "Fix run-test --trace option if --host is specified after."

* commit '0346b6bef939517b45216ee0eff4cf7a0c0667f4':
  Fix run-test --trace option if --host is specified after.