Merge "Add support for a --run-test-option to testrunner."