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

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