Move to bionic platform include.

Bug: 141560639

Test: Builds.
Change-Id: Iae00fc17c05f46d7c7128850d8e122925ef42777
Merged-In: Iae00fc17c05f46d7c7128850d8e122925ef42777
(cherry picked from commit d96352d019b8400cb1f9c57342d008afadf4a877)
diff --git a/build/Android.bp b/build/Android.bp
index 45564f4..e2767ff 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -146,8 +146,8 @@
             ],
             header_libs: [
                 // We optimize Thread::Current() with a direct TLS access. This requires access to a
-                //  private Bionic header.
-                "bionic_libc_private_headers",
+                //  platform specific Bionic header.
+                "bionic_libc_platform_headers",
             ],
         },
         linux: {
@@ -160,8 +160,8 @@
         linux_bionic: {
             header_libs: [
                 // We optimize Thread::Current() with a direct TLS access. This requires access to a
-                //  private Bionic header.
-                "bionic_libc_private_headers",
+                //  platform specific Bionic header.
+                "bionic_libc_platform_headers",
             ],
         },
         darwin: {
diff --git a/runtime/thread-current-inl.h b/runtime/thread-current-inl.h
index 36f767c..d12a45c 100644
--- a/runtime/thread-current-inl.h
+++ b/runtime/thread-current-inl.h
@@ -20,7 +20,7 @@
 #include "thread.h"
 
 #ifdef __BIONIC__
-#include <bionic_tls.h>  // Access to our own TLS slot.
+#include <bionic/tls.h>  // Access to our own TLS slot.
 #endif
 
 #include <pthread.h>