Merge "Remove gettid declaration from cutils" into main