Reset the test runner to match upstream.

This is just a place holder patch for the moment so that the diffs
look clean on Gerrit. The next patch needs to go upstream. Once it
does, it will be cherry picked as a fixup to this patch.

Change-Id: I60df9fb1e57bd0e1c6aac6adb32d9dcebfadb340
2 files changed