diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index acaf572097288d9854be96b725a6747a0d556d8d..fd797ae26f356b63d6a655ed4f72aac0e4350cb3 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -523,6 +523,7 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbt_shim_bridge",
+        "libbt_shim_ffi",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
         "libosi",
diff --git a/system/gd/os/log.h b/system/gd/os/log.h
index 0962efd471311776d4e3fafbe22d4364213c8c68..9e36f8ac3d95191170b967f4dcad9ac0d7e22570 100644
--- a/system/gd/os/log.h
+++ b/system/gd/os/log.h
@@ -163,18 +163,8 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL");
         ##args);                                                                                                    \
   } while (false)
 
-#define LOG_VERBOSE_INT(fmt, args...)                                                  \
-  do {                                                                                 \
-    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_VERBOSE) { \
-      LOGWRAPPER(fmt, ##args);                                                         \
-    }                                                                                  \
-  } while (false)
-#define LOG_DEBUG_INT(fmt, args...)                                                  \
-  do {                                                                               \
-    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_DEBUG) { \
-      LOGWRAPPER(fmt, ##args);                                                       \
-    }                                                                                \
-  } while (false)
+#define LOG_VERBOSE_INT(...) LOGWRAPPER(__VA_ARGS__)
+#define LOG_DEBUG_INT(...) LOGWRAPPER(__VA_ARGS__)
 #define LOG_INFO_INT(...) LOGWRAPPER(__VA_ARGS__)
 #define LOG_WARN_INT(...) LOGWRAPPER(__VA_ARGS__)
 #define LOG_ERROR_INT(...) LOGWRAPPER(__VA_ARGS__)