Merging r369399:

------------------------------------------------------------------------
r369399 | marshall | 2019-08-20 18:16:23 +0200 (Tue, 20 Aug 2019) | 1 line

Fix availability of __thread_id on builds with external threading. Reviewed as https://reviews.llvm.org/D66480
------------------------------------------------------------------------

llvm-svn: 369498