am c323b97c: am 87987df9: am daf69128: Merge "Fix x86_64 __set_tls.c build failure."

* commit 'c323b97c52297c4342dd45e329bad816f3bc5746':
  Fix x86_64 __set_tls.c build failure.