Merge "Consolidate SpHash to a separate header file"