Merge "cutils: add thread_defs header"