--- a/tools/profiler/core/platform.h	2017-05-27 11:44:06.733119794 +0000
+++ b/tools/profiler/core/platform.h	2017-05-27 11:46:16.004253520 +0000
@@ -54,10 +54,11 @@
 #include <vector>
 #include "StackTop.h"
 
-// We need a definition of gettid(), but glibc doesn't provide a
-// wrapper for it.
-#if defined(__GLIBC__)
+// We need a definition of gettid(), but Linux libc implementations don't
+// provide a wrapper for it (except for Bionic)
+#if defined(__linux__)
 #include <unistd.h>
+#if !defined(__BIONIC__)
 #include <sys/syscall.h>
 static inline pid_t gettid()
 {
@@ -71,6 +72,7 @@
   return (pid_t) syscall(SYS_thread_selfid);
 }
 #endif
+#endif
 
 #ifdef XP_WIN
 #include <windows.h>