Merge "Better fix for gettid() sim-eng breakage from last night."