diff --git a/Android.bp b/Android.bp
index 784f03f..2717132 100644
--- a/Android.bp
+++ b/Android.bp
@@ -830,7 +830,6 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcutils",
                 "libui",
-                "libc2d_helper",
                 "liblog",
                 "libc++",
                 "libc",
@@ -850,7 +849,6 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcutils",
                 "libui",
-                "libc2d_helper",
                 "liblog",
                 "libc++",
                 "libc",
@@ -860,6 +858,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     relative_install_path: "camera/components",
     prefer: true,
     soc_specific: true,
@@ -3632,7 +3631,6 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libutils",
                 "libvidhance",
-                "libsensorslog",
                 "libui",
                 "libc++",
                 "libc",
@@ -3650,7 +3648,6 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libutils",
                 "libvidhance",
-                "libsensorslog",
                 "libui",
                 "libc++",
                 "libc",
@@ -3660,6 +3657,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     relative_install_path: "camera/components",
     prefer: true,
     soc_specific: true,
@@ -3682,7 +3680,6 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libutils",
                 "libvidhance",
-                "libsensorslog",
                 "libui",
                 "libc++",
                 "libc",
@@ -3700,7 +3697,6 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libutils",
                 "libvidhance",
-                "libsensorslog",
                 "libui",
                 "libc++",
                 "libc",
@@ -3710,6 +3706,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     relative_install_path: "camera/components",
     prefer: true,
     soc_specific: true,
@@ -6258,8 +6255,6 @@ cc_prebuilt_library_shared {
                 "libqmi_cci",
                 "libqmi_common_so",
                 "libqmi_encdec",
-                "libsensorslog",
-                "libsnsapi",
                 "libmot_afd",
                 "libz",
                 "libdl",
@@ -6310,8 +6305,6 @@ cc_prebuilt_library_shared {
                 "libqmi_cci",
                 "libqmi_common_so",
                 "libqmi_encdec",
-                "libsensorslog",
-                "libsnsapi",
                 "libmot_afd",
                 "libz",
                 "libdl",
@@ -6321,6 +6314,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -6514,6 +6508,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -8016,6 +8011,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -8051,6 +8047,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "both",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -9783,14 +9780,12 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "libprotobuf-cpp-lite-3.9.1-vendorcompat",
                 "liblog",
-                "libsnsapi",
                 "libssc",
                 "libsnsdiaglog",
                 "libutils",
                 "libcutils",
                 "libsns_device_mode_stub",
                 "libsns_fastRPC_util",
-                "libsensorslog",
                 "libhardware",
                 "libhidlbase",
                 "android.hardware.sensors@2.0",
@@ -9807,6 +9802,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "64",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -10165,7 +10161,6 @@ cc_prebuilt_binary {
                 "libhidltransport",
                 "libutils",
                 "android.hardware.biometrics.fingerprint@2.1",
-                "vendor.egistec.hardware.fingerprint@4.0",
                 "com.motorola.hardware.biometric.fingerprint@1.0",
                 "libc++",
                 "libc",
@@ -10175,6 +10170,7 @@ cc_prebuilt_binary {
         },
     },
     compile_multilib: "64",
+    check_elf_files: false,
     strip: {
         none: true,
     },