diff --git a/SystemUIShared/build.gradle b/SystemUIShared/build.gradle
index 2257386fac..342da95438 100644
--- a/SystemUIShared/build.gradle
+++ b/SystemUIShared/build.gradle
@@ -38,7 +38,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    addFrameworkJar('framework-12.jar')
+    addFrameworkJar('framework-12l.jar')
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index f3f9c1da91..4878f4cc3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -270,7 +270,7 @@ android {
         }
     }
 
-    addFrameworkJar('framework-12.jar')
+    addFrameworkJar('framework-12l.jar')
 }
 
 allprojects {
@@ -289,7 +289,7 @@ dependencies {
     implementation "androidx.preference:preference-ktx:${ANDROID_X_VERSION}"
     implementation project(':iconloaderlib')
     implementation project(':searchuilib')
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'sysui_statslog.jar')
+    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'SystemUI-statsd.jar')
 
     // Recents lib dependency
     withQuickstepImplementation project(':SystemUIShared')
diff --git a/prebuilts/libs/SystemUI-statsd.jar b/prebuilts/libs/SystemUI-statsd.jar
new file mode 100644
index 0000000000..9a809c93e5
Binary files /dev/null and b/prebuilts/libs/SystemUI-statsd.jar differ
diff --git a/prebuilts/libs/framework-12l.jar b/prebuilts/libs/framework-12l.jar
new file mode 100644
index 0000000000..d12147c1ee
Binary files /dev/null and b/prebuilts/libs/framework-12l.jar differ
diff --git a/prebuilts/libs/framework-statsd.jar b/prebuilts/libs/framework-statsd.jar
new file mode 100644
index 0000000000..e4708c1135
Binary files /dev/null and b/prebuilts/libs/framework-statsd.jar differ
diff --git a/prebuilts/libs/sysui_statslog.jar b/prebuilts/libs/sysui_statslog.jar
deleted file mode 100644
index 518c95ddfc..0000000000
Binary files a/prebuilts/libs/sysui_statslog.jar and /dev/null differ