fb9277feac
This is mainly to allow bench_runner to at least compile after moving benches out of tree. Also cleaned up lingering runner/suite munging leftover from the change to an optional -R/--runner parameter.