diff --git a/daemon/src/main/jni/logging.h b/daemon/src/main/jni/logging.h
index 86a7220ac..5ebf4ec24 100644
--- a/daemon/src/main/jni/logging.h
+++ b/daemon/src/main/jni/logging.h
@@ -36,8 +36,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
-#define LOGV(fmt, ...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
+                        "%s:%d#%s"                                                                 \
+                        ": " fmt,                                                                  \
+                        __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0
diff --git a/dex2oat/src/main/cpp/include/logging.h b/dex2oat/src/main/cpp/include/logging.h
index ab66ef34c..36069bdd4 100644
--- a/dex2oat/src/main/cpp/include/logging.h
+++ b/dex2oat/src/main/cpp/include/logging.h
@@ -15,12 +15,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define LOGV(fmt, ...)                                                                             \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG,                                              \
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
                         "%s:%d#%s"                                                                 \
                         ": " fmt,                                                                  \
                         __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0
diff --git a/external/apache/commons-lang b/external/apache/commons-lang
index 675ab08d0..fd12207b0 160000
--- a/external/apache/commons-lang
+++ b/external/apache/commons-lang
@@ -1 +1 @@
-Subproject commit 675ab08d0eb62b7d2edd43fe42512c896e84bcd6
+Subproject commit fd12207b0bf02b39098b413ee618a748fb3dd450
diff --git a/external/fmt b/external/fmt
index 0e078f6ed..cdb8dc76d 160000
--- a/external/fmt
+++ b/external/fmt
@@ -1 +1 @@
-Subproject commit 0e078f6ed0624be8babc43bd145371d9f3a08aab
+Subproject commit cdb8dc76d936a12aacc20b6d283d7c24ee4307fe
diff --git a/native/include/common/logging.h b/native/include/common/logging.h
index 25533e4fb..a06585bc5 100644
--- a/native/include/common/logging.h
+++ b/native/include/common/logging.h
@@ -77,14 +77,13 @@ inline void LogToAndroid(int prio, const char *tag, fmt::format_string<T...> fmt
 }  // namespace vector::native::detail
 
 #ifndef NDEBUG
-#define LOGV(fmt, ...)                                                                             \
-    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG, "{}:{} ({}): " fmt,       \
-                                           __FILE_NAME__, __LINE__,                                \
-                                           __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
 #define LOGD(fmt, ...)                                                                             \
     ::vector::native::detail::LogToAndroid(ANDROID_LOG_DEBUG, LOG_TAG, "{}:{} ({}): " fmt,         \
                                            __FILE_NAME__, __LINE__,                                \
                                            __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(fmt, ...)                                                                             \
+    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG,                           \
+                                           fmt __VA_OPT__(, ) __VA_ARGS__)
 #else
 #define LOGV(...) ((void)0)
 #define LOGD(...) ((void)0)
diff --git a/xposed/libxposed b/xposed/libxposed
index eb63ec2c4..edeb8379c 160000
--- a/xposed/libxposed
+++ b/xposed/libxposed
@@ -1 +1 @@
-Subproject commit eb63ec2c49a34a9c3cd08a7eee2b5cd8332f46d2
+Subproject commit edeb8379c067b16b91af3cb526f5f04db25c06b6