diff --git a/Android.bp b/Android.bp
index c111926..26f05c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1768,6 +1768,7 @@ cc_prebuilt_library_shared {
                 "libhidlbase",
                 "vendor.qti.hardware.perf@2.0",
                 "libbase",
+                "libthermalclient",
                 "libqti-perfd-client",
                 "libperfconfig",
                 "libperfgluelayer",
@@ -1793,6 +1794,7 @@ cc_prebuilt_library_shared {
                 "libhidlbase",
                 "vendor.qti.hardware.perf@2.0",
                 "libbase",
+                "libthermalclient",
                 "libqti-perfd-client",
                 "libperfconfig",
                 "libperfgluelayer",
@@ -1807,7 +1809,6 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
-    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -8231,6 +8232,7 @@ cc_prebuilt_library_shared {
                 "libc++",
                 "libcutils",
                 "liblog",
+                "libofflinelog",
                 "libsync",
                 "android.hardware.graphics.mapper@2.0",
                 "android.hardware.graphics.mapper@3.0",
@@ -8246,7 +8248,6 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "64",
-    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -13190,3 +13191,15 @@ install_symlink {
     installed_location: "lib64/libq3dtools_adreno.so",
     symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
 }
+
+cc_library_shared {
+    name: "libthermalclient",
+    compile_multilib: "both",
+    soc_specific: true,
+}
+
+cc_library_shared {
+    name: "libofflinelog",
+    compile_multilib: "64",
+    soc_specific: true,
+}