diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 64be7a1f2070a73797ef9b948f331ddbbd2d96b0..3de9908ec366e49e36895681d00792c022781bce 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -579,6 +579,7 @@ cc_test {
     srcs: [
         ":BtaDmSources",
         ":LibBluetoothSources",
+        ":OsiCompatSources",
         ":TestCommonCoreInterface",
         ":TestCommonMainHandler",
         ":TestCommonMockFunctions",
diff --git a/system/btif/test/btif_hh_test.cc b/system/btif/test/btif_hh_test.cc
index 791c2b6bc0712c45f5e3ee347f7a07d4969f6285..a4eb9b36935550fa96f2ab84d0d3874fe691a719 100644
--- a/system/btif/test/btif_hh_test.cc
+++ b/system/btif/test/btif_hh_test.cc
@@ -67,32 +67,6 @@ extern bool bluetooth_shim_is_gd_stack_started_up;
 }
 }  // namespace test
 
-#if __GLIBC__
-size_t strlcpy(char* dst, const char* src, size_t siz) {
-  char* d = dst;
-  const char* s = src;
-  size_t n = siz;
-
-  /* Copy as many bytes as will fit */
-  if (n != 0) {
-    while (--n != 0) {
-      if ((*d++ = *s++) == '\0') break;
-    }
-  }
-
-  /* Not enough room in dst, add NUL and traverse rest of src */
-  if (n == 0) {
-    if (siz != 0) *d = '\0'; /* NUL-terminate dst */
-    while (*s++)
-      ;
-  }
-
-  return (s - src - 1); /* count does not include NUL */
-}
-
-pid_t gettid(void) throw() { return syscall(SYS_gettid); }
-#endif
-
 namespace {
 std::array<uint8_t, 32> data32 = {
     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,