Merge "benchmarks: Convert benchmarkHooks to use Benchmarker"