Merge "Remove dead code related to gettid"