Merge "Use correct TLS codepath for linker"