am 7fdb0593: am aab012d6: Merge "Add --trace variants of the run-test testing rules."

* commit '7fdb0593bf881b992e3e9806985d2e77d01f73b0':
  Add --trace variants of the run-test testing rules.