Merge "Revert "Set timeout for testrunner in go/ab""