Merge "Work around CLONE_SETTLS being weird on x86."