Merge "Remove bench_locks, which is a subset of bench_pthread."