diff --git a/libcutils/include/cutils/trace.h b/libcutils/include/cutils/trace.h
index b2779b2..bbb150d 100644
--- a/libcutils/include/cutils/trace.h
+++ b/libcutils/include/cutils/trace.h
@@ -73,7 +73,8 @@
 #define ATRACE_TAG_NETWORK          (1<<21)
 #define ATRACE_TAG_ADB              (1<<22)
 #define ATRACE_TAG_VIBRATOR         (1<<23)
-#define ATRACE_TAG_LAST             ATRACE_TAG_VIBRATOR
+#define ATRACE_TAG_AIDL             (1<<24)
+#define ATRACE_TAG_LAST             ATRACE_TAG_AIDL
 
 // Reserved for initialization.
 #define ATRACE_TAG_NOT_READY        (1ULL<<63)
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 1d8afb4..e2e5c4e 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -1201,7 +1201,7 @@
         (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
 
 #ifdef LMKD_LOG_STATS
-    statlog_init();
+    statslog_init(&log_ctx, &enable_stats_log);
 #endif
 
     // MCL_ONFAULT pins pages as they fault instead of loading
@@ -1221,7 +1221,7 @@
         mainloop();
 
 #ifdef LMKD_LOG_STATS
-    statslog_destroy();
+    statslog_destroy(&log_ctx);
 #endif
 
     ALOGI("exiting");
diff --git a/lmkd/statslog.h b/lmkd/statslog.h
index b567fbf..4cde840 100644
--- a/lmkd/statslog.h
+++ b/lmkd/statslog.h
@@ -17,6 +17,7 @@
 #ifndef _STATSLOG_H_
 #define _STATSLOG_H_
 
+#include <assert.h>
 #include <stdbool.h>
 #include <sys/cdefs.h>
 
@@ -34,17 +35,26 @@
 #define LMK_STATE_CHANGE_START 1
 #define LMK_STATE_CHANGE_STOP 2
 
-static inline void statslog_init() {
-    enable_stats_log = property_get_bool("ro.lmk.log_stats", false);
+/*
+ * The single event tag id for all stats logs.
+ * Keep this in sync with system/core/logcat/event.logtags
+ */
+const static int kStatsEventTag = 1937006964;
 
-    if (enable_stats_log) {
-        log_ctx = create_android_logger(kStatsEventTag);
+static inline void statslog_init(android_log_context* log_ctx, bool* enable_stats_log) {
+    assert(log_ctx != NULL);
+    assert(enable_stats_log != NULL);
+    *enable_stats_log = property_get_bool("ro.lmk.log_stats", false);
+
+    if (*enable_stats_log) {
+        *log_ctx = create_android_logger(kStatsEventTag);
     }
 }
 
-static inline void statslog_destroy() {
-    if (log_ctx) {
-        android_log_destroy(&log_ctx);
+static inline void statslog_destroy(android_log_context* log_ctx) {
+    assert(log_ctx != NULL);
+    if (*log_ctx) {
+        android_log_destroy(log_ctx);
     }
 }
 
@@ -58,12 +68,6 @@
 
 #define MEMCG_PROCESS_MEMORY_STAT_PATH "/dev/memcg/apps/uid_%u/pid_%u/memory.stat"
 
-/*
- * The single event tag id for all stats logs.
- * Keep this in sync with system/core/logcat/event.logtags
- */
-const static int kStatsEventTag = 1937006964;
-
 /**
  * Logs the change in LMKD state which is used as start/stop boundaries for logging
  * LMK_KILL_OCCURRED event.