Merge "Fix a CC deadlock in 129-ThreadGetId."