Merge "Revert "Remove cutils threads.h header completely."" into main