Merge "Remove gettid symbol from cutils" into main