diff --git a/Android.bp b/Android.bp
index 5b84590..2635b35 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,9 +5,4204 @@
 soong_namespace {
 	imports: [
 		"vendor/xiaomi/sm8250-common",
+		"hardware/qcom-caf/common/libqti-perfd-client",
+		"hardware/xiaomi",
+		"vendor/qcom/opensource/display",
 	],
 }
 
+cc_prebuilt_library_shared {
+	name: "audio.primary.cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/hw/audio.primary.cmi.so"],
+			shared_libs: ["libbase", "liblog", "libcutils", "libtinyalsa", "libtinycompress", "libaudioroute", "libaudioutils", "libexpat", "libhidlbase", "libprocessgroup", "libutils", "libaudioroute_ext", "libhardware_legacy", "libaudiocloudctrl", "libresampler", "libaudio_log_utils", "vendor.qti.hardware.audiohalext@1.0", "android.hardware.power@1.2", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	relative_install_path: "hw",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "liba2dpoffload_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/liba2dpoffload_cmi.so"],
+			shared_libs: ["libaudioutils", "libcutils", "liblog", "libtinyalsa", "libtinycompress", "libaudioroute", "libexpat", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaudio_log_utils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaudio_log_utils.so"],
+			shared_libs: ["libutils", "libcutils", "libexpat", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaudiocloudctrl",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaudiocloudctrl.so"],
+			shared_libs: ["liblog", "libcutils", "libtinyxml2", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaudioconfigstore",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaudioconfigstore.so"],
+			shared_libs: ["libexpat", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaudioparsers",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaudioparsers.so"],
+			shared_libs: ["libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaudioroute_ext",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaudioroute_ext.so"],
+			shared_libs: ["liblog", "libcutils", "libtinyalsa", "libaudioroute", "libexpat", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libhdmipassthru",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libhdmipassthru.so"],
+			shared_libs: ["libaudioparsers", "libaudioroute", "libaudioutils", "libcutils", "libexpat", "liblog", "libtinyalsa", "libtinycompress", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libresampler",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libresampler.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.qti.hardware.audiohalext@1.0",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/vendor.qti.hardware.audiohalext@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libxlog",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/vndk/libxlog.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	relative_install_path: "vndk",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.actuator.cmi_sunny_ultra_dw9800",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.actuator.cmi_sunny_ultra_dw9800.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_ov08a10_m24c64",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_ov08a10_m24c64x",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64x.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_s5k2l7_m24c64x",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5k2l7_m24c64x.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_s5khmx_m24c128",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_s5khmx_m24c128x",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128x.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_semco_s5khmx_m24c64",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c64.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_sunny_imx350_gt24p64b",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_sunny_imx350_gt24p64b.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.hawkeye_semco_ov48c_m24c64x",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.hawkeye_semco_ov48c_m24c64x.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.truly_cmb433",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.truly_cmb433.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eeprom.umi_sunny_s5k5e8yx_depth",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.eeprom.umi_sunny_s5k5e8yx_depth.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.cmi_s5k5e8yx_macro",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.cmi_s5k5e8yx_macro.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.imx350_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.imx350_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.imx563",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.imx563.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.ov08a10_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.ov08a10_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.ov48c_hawkeye",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.ov48c_hawkeye.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.s5k2l7_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.s5k2l7_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.s5k3t2_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.s5k3t2_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.s5khmx_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.s5khmx_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.sensor.s5khmx_wide_cmi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/com.qti.sensor.s5khmx_wide_cmi.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.arcsoft.node.deflicker",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.arcsoft.node.deflicker.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "liblog", "libchilog", "libutils", "libcutils", "libmpbase", "libarcsoft_preview_deflicker", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.arcsoft.node.smoothtransition",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.arcsoft.node.smoothtransition.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libtriplecam_video_optical_zoom", "libdualcam_video_optical_zoom", "libmulticam_video_optical_zoom", "libmulticam_image_optical_zoom", "libcutils", "libmpbase", "liblog", "libchilog", "libutils", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.arcsoft.node.superportrait",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.arcsoft.node.superportrait.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libsync", "libchilog", "libarcsoft_superportrait", "libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.facepp.node.siq",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.facepp.node.siq.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libutils", "libcutils", "liblog", "libst_soft_isp_shared", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.AIIE",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.AIIE.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libsync", "libchilog", "libmialgo_ie_preview", "libutils", "libcutils", "libion", "libmialgo_video_enhance", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.aiasd",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.aiasd.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "liblog", "libchilog", "libutils", "libcutils", "libmialgo_sd", "libc++_shared", "libcamera_scene", "libcamera_dirty", "libxmi_high_dynamic_range", "libsnpe_dsp_domains_v2", "libSNPE", "libsymphony-cpu", "libMIAIHDRhvx_interface", "libst_soft_isp_calc_exposure_shared", "libarcsoft_hdr_detection", "libarcsoft_high_dynamic_range", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.bodyslim",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.bodyslim.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libsync", "libchilog", "libarcsoft_bodyslim", "libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.distortioncorrection",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.distortioncorrection.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libutils", "libcutils", "libmpbase", "libarcsoft_distortion_correction", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.hdr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.hdr.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "liblog", "libchilog", "libutils", "libcutils", "libmpbase", "libxmi_high_dynamic_range", "libMIAIHDRhvx_interface", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.mimovie",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.mimovie.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libutils", "libcutils", "libxml2", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.realtimebokeh",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.realtimebokeh.so"],
+			shared_libs: ["libarcsoft_dualcam_refocus", "libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libcutils", "libmpbase", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.rearvideo",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.rearvideo.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libsync", "libutils", "libcutils", "libchilog", "libvideoBokeh", "libmialgo_video_seg", "libmialgo_video_colourkeeping", "libmialgo_image_colourkeeping", "libion", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.skinbeautifier",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.skinbeautifier.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libsync", "libchilog", "libarcsoft_beautyshot", "libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.superlowlightraw",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.superlowlightraw.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libutils", "libcutils", "libmpbase", "libarcsoft_super_night_raw", "libarcsoft_hdrplus_hvx_stub", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.videobokeh",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.videobokeh.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcutils", "libcom.qti.chinodeutils", "libmibokeh_845_video", "libmibokeh_855", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.mi.node.watermark",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.mi.node.watermark.so"],
+			shared_libs: ["libpiex_shim", "libcutils", "libutils", "libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libjpeg", "libpng", "libz", "libpiex", "libexpat", "libdng_sdk2vendor", "libEGL", "libGLESv2", "libnativewindow", "libft2vendor", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.camx.chiiqutils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.camx.chiiqutils.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libutilscallstack", "libchilog", "libcom.qti.chinodeutils", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eisv2",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.eisv2.so"],
+			shared_libs: ["libcutils", "liblog", "libsync", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.eisv3",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.eisv3.so"],
+			shared_libs: ["libcutils", "liblog", "libsync", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.hvx.addconstant",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.hvx.addconstant.so"],
+			shared_libs: ["libchilog", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.hvx.binning",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.hvx.binning.so"],
+			shared_libs: ["libchilog", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.customhwnode",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.customhwnode.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libchilog", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.depth",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.depth.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.dummyrtb",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.dummyrtb.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.dummysat",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.dummysat.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.eisv2",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libutilscallstack", "libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.eisv3",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libutilscallstack", "libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.fcv",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.fcv.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.gpu",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.gpu.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.ldc",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.ldc.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "liblog", "libutils", "libcutils", "libmibokeh_855", "libalLDC", "libalhLDC", "libalAILDC", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.memcpy",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.memcpy.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.remosaic",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.remosaic.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libutils", "libcutils", "libremosaic_wrapper", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.softisppost",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.softisppost.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.stich",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.stich.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.node.swregistration",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.node.swregistration.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.aec",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.aecwrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.af",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.af.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.afd",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.afd.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.afwrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.asd",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.asd.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.awb",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.awb.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.awbwrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.haf",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.haf.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.hafoverride",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.hafoverride.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.pdlib",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.pdlib.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.pdlibsony",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.pdlibwrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibwrapper.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.stats.tracker",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libfastcvopt", "libfastcvdsp_stub", "libscveCommon", "libscveCommon_stub", "libscveObjectTracker", "libscveObjectTracker_stub", "libscveObjectSegmentation", "libscveObjectSegmentation_stub", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qtistatic.stats.aec",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so"],
+			shared_libs: ["libchilog", "libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qtistatic.stats.af",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so"],
+			shared_libs: ["libchilog", "libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qtistatic.stats.awb",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so"],
+			shared_libs: ["libchilog", "libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qtistatic.stats.pdlib",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so"],
+			shared_libs: ["libchilog", "libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.vidhance.node.eis",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.vidhance.node.eis.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "libcom.qti.chinodeutils", "libvidhance", "libutils", "libcutils", "libui", "libsensorslog", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.vidhance.stats.aec_dmbr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so"],
+			shared_libs: ["libcutils", "libchilog", "liblog", "libofflinelog", "libsync", "libhidlbase", "libhidltransport", "android.frameworks.sensorservice@1.0", "libvidhance", "libutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.xiaomi.node.mibokeh",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.xiaomi.node.mibokeh.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libutils", "libcutils", "libarcsoft_portrait_lighting", "libarcsoft_portrait_lighting_c", "libchilog", "libmibokeh_855", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.xiaomi.node.mifilter",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.xiaomi.node.mifilter.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "liblog", "libcom.qti.chinodeutils", "libutils", "libcutils", "libvideofilter_only", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.xiaomi.node.misegment",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.xiaomi.node.misegment.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libutils", "libcutils", "libchilog", "libmibokeh_855", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.xiaomi.node.tracker",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/com.xiaomi.node.tracker.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "liblog", "libcom.qti.chinodeutils", "libfocus", "libSNPE", "libsymphony-cpu", "libutils", "libcutils", "libui", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libdepthmapwrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/libdepthmapwrapper.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libubifocus",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/camera/components/libubifocus.so"],
+			shared_libs: ["libc", "libm", "libdl", "liblog", "libz", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "camera/components",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.anchorsync",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.anchorsync.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libion", "libmialgo_utils", "libmialgo_rfs", "libOpenCL", "libcdsprpc", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.demux",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.demux.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.frameselect",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.frameselect.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.fusion",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.fusion.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.generic",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.generic.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.gs",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.gs.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.hdr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.hdr.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.memcpy",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.memcpy.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.mfsr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.mfsr.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.qcfa",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.qcfa.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.rawhdr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.rawhdr.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.rawsupernight",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.rawsupernight.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.rt",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.rt.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.serializer",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.serializer.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.softispprocess",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.softispprocess.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.softispsupernight",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.softispsupernight.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.sr",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.sr.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.stub",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.stub.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.feature2.swmf",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/com.qti.feature2.swmf.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "camera.qcom",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/hw/camera.qcom.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libutilscallstack", "libcamera_metadata", "libcamxfdengine", "libcamximageformatutils", "libcamxncs", "libcamxstatscore", "libmegface", "libMegviiFacepp-0.5.2", "libcvp2", "libcvp_common", "libsynx", "libz", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "hw",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.qti.chi.override",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/hw/com.qti.chi.override.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcamera_metadata", "libchilog", "libhardware", "libhidlbase", "libhidltransport", "libqdMetaData", "libutils", "vendor.qti.hardware.camera.postproc@1.0-service-impl", "vendor.qti.hardware.vpp@1.1", "vendor.qti.hardware.vpp@1.2", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "hw",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "fingerprint.goodix_fod.default",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so"],
+			shared_libs: ["libhidlbase", "libhwbinder", "libhidltransport", "libutils", "libcutils", "liblog", "libhardware", "libion", "libgf_hal", "libc", "libm", "libdl", "libc++", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "hw",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.qti.hardware.sensorscalibrate@1.0-impl",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so"],
+			shared_libs: ["libhidlbase", "libutils", "liblog", "libcutils", "libhardware", "libbase", "vendor.qti.hardware.sensorscalibrate@1.0", "libsensorcal", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	relative_install_path: "hw",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libMIAIHDRhvx_interface",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libMIAIHDRhvx_interface.so"],
+			shared_libs: ["liblog", "libcdsprpc", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libSNPE",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libSNPE.so"],
+			shared_libs: ["libdl", "liblog", "libc++_shared", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libalAILDC",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libalAILDC.so"],
+			shared_libs: ["libc++_shared", "liblog", "libGLESv3", "libEGL", "libnativewindow", "libOpenCL", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libalLDC",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libalLDC.so"],
+			shared_libs: ["liblog", "libGLESv3", "libEGL", "libnativewindow", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libalhLDC",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libalhLDC.so"],
+			shared_libs: ["libc++_shared", "libOpenCL", "liblog", "libGLESv3", "libEGL", "libnativewindow", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcdualcamsat",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcdualcamsat.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libdualcam_video_optical_zoom", "libcutils", "libmpbase", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcmulticamsat",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcmulticamsat.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libmulticam_video_optical_zoom", "libcutils", "libmpbase", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsat",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsat.so"],
+			shared_libs: ["libcamera_metadata", "libcom.qti.chinodeutils", "libtriplecam_video_optical_zoom", "libcutils", "libmpbase", "libz", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_beautyshot",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_beautyshot.so"],
+			shared_libs: ["libc++_shared", "libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_bodyslim",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_bodyslim.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libEGL", "libGLESv3", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_distortion_correction",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_distortion_correction.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_dualcam_refocus",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus.so"],
+			shared_libs: ["libarcsoft_dualcam_refocus_rear_t", "libarcsoft_dualcam_refocus_rear_w", "libarcsoft_dualcam_refocus_front", "libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_dualcam_refocus_front",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_front.so"],
+			shared_libs: ["libmpbase", "libcvp2", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_dualcam_refocus_rear_t",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_rear_t.so"],
+			shared_libs: ["libmpbase", "libcvp2", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_dualcam_refocus_rear_w",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_rear_w.so"],
+			shared_libs: ["libmpbase", "libcvp2", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_hdr_detection",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_hdr_detection.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_hdrplus_hvx_stub",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_hdrplus_hvx_stub.so"],
+			shared_libs: ["liblog", "libcdsprpc", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_high_dynamic_range",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_high_dynamic_range.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_portrait_lighting",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_portrait_lighting.so"],
+			shared_libs: ["libmpbase", "libarcsoft_portrait_lighting_c", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_portrait_lighting_c",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_portrait_lighting_c.so"],
+			shared_libs: ["libOpenCL", "liblog", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_preview_deflicker",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_preview_deflicker.so"],
+			shared_libs: ["liblog", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_super_night_raw",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_super_night_raw.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "libarcsoft_hdrplus_hvx_stub", "libcdsprpc", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_superportrait",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libarcsoft_superportrait.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libc++_shared",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libc++_shared.so"],
+			shared_libs: ["libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamera_dirty",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamera_dirty.so"],
+			shared_libs: ["libc++_shared", "liblog", "libm", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamera_nn_stub",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamera_nn_stub.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamera_scene",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamera_scene.so"],
+			shared_libs: ["libSNPE", "liblog", "libm", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamerapostproc",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamerapostproc.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "com.qti.chi.override", "com.qti.feature2.generic", "com.qti.feature2.gs", "libcamera_metadata", "libchilog", "libqdMetaData", "libz", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxexternalformatutils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxexternalformatutils.so"],
+			shared_libs: ["libcutils", "liblog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxfacialfeatures",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxfacialfeatures.so"],
+			shared_libs: ["libcamxfdalgo", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxfdalgo",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxfdalgo.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxfdengine",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxfdengine.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libcamera_nn_stub", "libcdsprpc", "libcamxfdalgo", "libcamxfacialfeatures", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxifestriping",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxifestriping.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamximageformatutils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamximageformatutils.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libutilscallstack", "libutils", "libhidlbase", "libhidltransport", "libhwbinder", "vendor.display.config@1.0", "vendor.display.config@1.1", "vendor.display.config@1.2", "vendor.display.config@1.3", "vendor.display.config@1.4", "vendor.display.config@1.5", "vendor.display.config@1.6", "vendor.display.config@1.7", "vendor.display.config@1.8", "vendor.display.config@1.9", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "vendor.qti.hardware.display.mapper@1.0", "vendor.qti.hardware.display.mapper@2.0", "vendor.qti.hardware.display.mapper@3.0", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxncs",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxncs.so"],
+			shared_libs: ["libutils", "libprotobuf-cpp-full-3.9.1-vendorcompat", "libsensorslog", "libqmi_common_so", "libqmi_cci", "libqmi_encdec", "libsnsapi", "libhardware", "libcutils", "libofflinelog", "libz", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxstatscore",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxstatscore.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxswprocessalgo",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxswprocessalgo.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcamxtintlessalgo",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcamxtintlessalgo.so"],
+			shared_libs: ["libcutils", "liblog", "libofflinelog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libchilog",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libchilog.so"],
+			shared_libs: ["libcutils", "liblog", "libsync", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcom.qti.chinodeutils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcom.qti.chinodeutils.so"],
+			shared_libs: ["libcamera_metadata", "libchilog", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcvp2",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcvp2.so"],
+			shared_libs: ["liblog", "libion", "libcvp_common", "libcvp2_hfi", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcvp2_hfi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcvp2_hfi.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcvp_common",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcvp_common.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcvpcpuRev_skel",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libcvpcpuRev_skel.so"],
+			shared_libs: ["liblog", "libc++", "libcdsprpc", "libion", "libcvp_common", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libdng_sdk2vendor",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libdng_sdk2vendor.so"],
+			shared_libs: ["libz", "libjpeg", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libdualcam_optical_zoom_control",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libdualcam_optical_zoom_control.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libdualcam_video_optical_zoom",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libdualcam_video_optical_zoom.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libflaw",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libflaw.so"],
+			shared_libs: ["libOpenCL", "libc++_shared", "liblog", "libm", "libz", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libfocus",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libfocus.so"],
+			shared_libs: ["libSNPE", "libsymphony-cpu", "libc++_shared", "libGLESv2", "libEGL", "libz", "libm", "liblog", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libft2vendor",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libft2vendor.so"],
+			shared_libs: ["libpng", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libgf_hal",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libgf_hal.so"],
+			shared_libs: ["libhidlbase", "libhwbinder", "libhidltransport", "libutils", "libcutils", "liblog", "libhardware", "libion", "libQSEEComAPI", "vendor.goodix.hardware.biometrics.fingerprint@2.1", "libc", "libm", "libdl", "libc++", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libhta",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libhta.so"],
+			shared_libs: ["liblog", "libcdsprpc", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libipebpsstriping",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libipebpsstriping.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "libcdsprpc", "libqdMetaData", "libhardware", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_ie_preview",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_ie_preview.so"],
+			shared_libs: ["libmialgo_utils", "libion", "libcdsprpc", "libOpenCL", "libc++_shared", "libm", "liblog", "libz", "libc", "libGLESv3", "libEGL", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_image_colourkeeping",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_image_colourkeeping.so"],
+			shared_libs: ["libion", "libOpenCL", "libcdsprpc", "libmialgo_utils", "libc++_shared", "libm", "liblog", "libz", "libc", "libGLESv3", "libEGL", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_rfs",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_rfs.so"],
+			shared_libs: ["liblog", "libmialgo_utils", "libcdsprpc", "libion", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_sd",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_sd.so"],
+			shared_libs: ["liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_utils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_utils.so"],
+			shared_libs: ["libcdsprpc", "libOpenCL", "liblog", "libc++_shared", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_video_colourkeeping",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_video_colourkeeping.so"],
+			shared_libs: ["libion", "libOpenCL", "libcdsprpc", "libmialgo_utils", "libc++_shared", "libm", "liblog", "libz", "libc", "libGLESv3", "libEGL", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_video_enhance",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_video_enhance.so"],
+			shared_libs: ["libmialgo_utils", "libion", "libcdsprpc", "libOpenCL", "libc++_shared", "libm", "liblog", "libz", "libc", "libGLESv3", "libEGL", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmialgo_video_seg",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmialgo_video_seg.so"],
+			shared_libs: ["libmialgo_utils", "libSNPE", "libion", "libsymphony-cpu", "libc++_shared", "libm", "liblog", "libz", "libc", "libGLESv3", "libEGL", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmibokeh_845_video",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmibokeh_845_video.so"],
+			shared_libs: ["libsymphony-cpu", "libsnpe_dsp_domains_v2", "libSNPE", "libOpenCL", "liblog", "libz", "libm", "libc++_shared", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmibokeh_855",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmibokeh_855.so"],
+			shared_libs: ["libOpenCL", "liblog", "libmialgo_image_colourkeeping", "libz", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmpbase",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmpbase.so"],
+			shared_libs: ["libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmulticam_image_optical_zoom",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmulticam_image_optical_zoom.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmulticam_optical_zoom_control",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmulticam_optical_zoom_control.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmulticam_video_optical_zoom",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libmulticam_video_optical_zoom.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libnotifyaudiohal",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libnotifyaudiohal.so"],
+			shared_libs: ["libultrasound", "liblog", "libc", "libm", "libdl", "libc++", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libnpu",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libnpu.so"],
+			shared_libs: ["liblog", "libcdsprpc", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libofflinelog",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libofflinelog.so"],
+			shared_libs: ["libcutils", "liblog", "libsync", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libos",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libos.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libremosaic_wrapper",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libremosaic_wrapper.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libremosaichvx_stub",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libremosaichvx_stub.so"],
+			shared_libs: ["liblog", "libcdsprpc", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libremosaiclib",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libremosaiclib.so"],
+			shared_libs: ["liblog", "libc", "libc++", "libdl", "libion", "libcdsprpc", "libremosaichvx_stub", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsensorcal",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsensorcal.so"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "liblog", "libssc", "libutils", "libcutils", "libsensorslog", "libsnsapi", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsensorslog",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsensorslog.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsn100u_fw",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsn100u_fw.so"],
+			shared_libs: [ ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnpe_adsp",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnpe_adsp.so"],
+			shared_libs: ["liblog", "libdl", "libadsprpc", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnpe_dsp_domains",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnpe_dsp_domains.so"],
+			shared_libs: ["liblog", "libdl", "libcdsprpc", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnpe_dsp_domains_system",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnpe_dsp_domains_system.so"],
+			shared_libs: ["liblog", "libdl", "libcdsprpc_system", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnpe_dsp_domains_v2",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so"],
+			shared_libs: ["liblog", "libdl", "libcdsprpc", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnpe_dsp_domains_v2_system",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnpe_dsp_domains_v2_system.so"],
+			shared_libs: ["liblog", "libdl", "libcdsprpc_system", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsns_fastRPC_util",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsns_fastRPC_util.so"],
+			shared_libs: ["liblog", "libc", "libutils", "libcutils", "libc++", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsns_low_lat_stream_stub",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsns_low_lat_stream_stub.so"],
+			shared_libs: ["libsns_fastRPC_util", "liblog", "libc", "libutils", "libcutils", "libc++", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsns_registry_skel",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsns_registry_skel.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnsapi",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnsapi.so"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "libcutils", "libutils", "libqmi_common_so", "libqmi_cci", "libqmi_encdec", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsnsdiaglog",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsnsdiaglog.so"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "liblog", "libdiag", "libsensorslog", "libutils", "libcutils", "libssc", "libsnsapi", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libssc",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libssc.so"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "liblog", "libsensorslog", "libcutils", "libutils", "libqmi_common_so", "libqmi_cci", "libqmi_encdec", "libsnsapi", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libssc_default_listener",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libssc_default_listener.so"],
+			shared_libs: ["liblog", "libsdsprpc", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libst_soft_isp_calc_exposure_shared",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libst_soft_isp_calc_exposure_shared.so"],
+			shared_libs: ["libOpenCL", "liblog", "libm", "libc++_shared", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libst_soft_isp_shared",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libst_soft_isp_shared.so"],
+			shared_libs: ["libOpenCL", "liblog", "libm", "libst_soft_isp_calc_exposure_shared", "libdl", "libc++_shared", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsymphony-cpu",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsymphony-cpu.so"],
+			shared_libs: ["liblog", "libc++_shared", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsynx",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libsynx.so"],
+			shared_libs: ["libos", "libthreadutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libthreadutils",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libthreadutils.so"],
+			shared_libs: ["libos", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libtriplecam_optical_zoom_control",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libtriplecam_optical_zoom_control.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libtriplecam_video_optical_zoom",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libultrasound",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libultrasound.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libvideoBokeh",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libvideoBokeh.so"],
+			shared_libs: ["libmialgo_utils", "libion", "libOpenCL", "libcdsprpc", "libc++_shared", "libm", "liblog", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libvideofilter_only",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libvideofilter_only.so"],
+			shared_libs: ["libGLESv3", "libEGL", "liblog", "libc++_shared", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libvidhance",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libvidhance.so"],
+			shared_libs: ["libGLESv3", "libEGL", "libGLESv2", "libdl", "libm", "liblog", "libc++", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libxmi_high_dynamic_range",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libxmi_high_dynamic_range.so"],
+			shared_libs: ["libm", "liblog", "libz", "libOpenCL", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "sensors.elliptic",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/sensors.elliptic.so"],
+			shared_libs: ["libnotifyaudiohal", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "sensors.mius.proximity",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/sensors.mius.proximity.so"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libultrasound", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "sensors.ssc",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/sensors.ssc.so"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "liblog", "libsnsapi", "libssc", "libsnsdiaglog", "libutils", "libcutils", "libsns_fastRPC_util", "libsensorslog", "libhardware", "libhidlbase", "android.hardware.sensors@1.0", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@2.0", "vendor.qti.hardware.display.mapper@3.0", "vendor.qti.hardware.display.mapper@2.0", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "sensors.touch",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/sensors.touch.so"],
+			shared_libs: ["liblog", "libcutils", "libprotobuf-cpp-full-3.9.1-vendorcompat", "libutils", "libhardware", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.qti.hardware.camera.postproc@1.0-service-impl",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so"],
+			shared_libs: ["libc++", "libcutils", "liblog", "libofflinelog", "libsync", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@3.0", "libcamera_metadata", "libhidlbase", "libhidltransport", "libutils", "vendor.qti.hardware.camera.postproc@1.0", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.qti.hardware.sensorscalibrate@1.0",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "capi_v2_cirrus_sp",
+	filename: "capi_v2_cirrus_sp.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_cirrus_sp.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "hrtf5c",
+	filename: "hrtf5c.bin",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/hrtf5c.bin",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libMIAIHDR_skel",
+	filename: "libMIAIHDR_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libMIAIHDR_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libQ6MSFR_manager_skel",
+	filename: "libQ6MSFR_manager_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libQ6MSFR_manager_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libSuperSensor_skel",
+	filename: "libSuperSensor_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libSuperSensor_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libapps_mem_heap",
+	filename: "libapps_mem_heap.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libarcsoft_hdrplus_hvx_skel",
+	filename: "libarcsoft_hdrplus_hvx_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libarcsoft_hdrplus_hvx_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libbitml_nsp_skel",
+	filename: "libbitml_nsp_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libcalculator_domains_skel",
+	filename: "libcalculator_domains_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libcalculator_domains_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libcalculator_skel",
+	filename: "libcalculator_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libcalculator_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libcamera_nn_skel",
+	filename: "libcamera_nn_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libcamera_nn_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libcvpdsp_skel",
+	filename: "libcvpdsp_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libcvpdsp_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libdspCV_skel",
+	filename: "libdspCV_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libdsp_streamer_binning",
+	filename: "libdsp_streamer_binning.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_binning.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libfastcvadsp",
+	filename: "libfastcvadsp.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libfastcvdsp_skel",
+	filename: "libfastcvdsp_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libfastcvdsp_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libfrc_mobilenet",
+	filename: "libfrc_mobilenet.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libfrc_mobilenet.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libhexagon_nn_skel",
+	filename: "libhexagon_nn_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libmialgo_rfs_cdsp_skel",
+	filename: "libmialgo_rfs_cdsp_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libmobilenet_dsp",
+	filename: "libmobilenet_dsp.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libmobilenet_dsp.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libremosaichvx_skel",
+	filename: "libremosaichvx_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libremosaichvx_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libscveObjectSegmentation_skel",
+	filename: "libscveObjectSegmentation_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libscveT2T_skel",
+	filename: "libscveT2T_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsnpe_dsp_domains_skel",
+	filename: "libsnpe_dsp_domains_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_domains_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsnpe_dsp_skel",
+	filename: "libsnpe_dsp_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsnpe_dsp_v65_domains_v2_skel",
+	filename: "libsnpe_dsp_v65_domains_v2_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsnpe_dsp_v66_domains_v2_skel",
+	filename: "libsnpe_dsp_v66_domains_v2_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsns_device_mode_skel",
+	filename: "libsns_device_mode_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "libsns_low_lat_stream_skel",
+	filename: "libsns_low_lat_stream_skel.so",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "misound_karaoke_res",
+	filename: "misound_karaoke_res.bin",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/misound_karaoke_res.bin",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "misound_karaokemix_res",
+	filename: "misound_karaokemix_res.bin",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/misound_karaokemix_res.bin",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
+prebuilt_rfsa {
+	name: "misound_res",
+	filename: "misound_res.bin",
+	owner: "xiaomi",
+	src: "proprietary/vendor/lib/rfsa/adsp/misound_res.bin",
+	relative_install_path: "adsp",
+	soc_specific: true,
+}
+
 android_app_import {
 	name: "HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND",
 	owner: "xiaomi",
@@ -39,3 +4234,105 @@ dex_import {
 	system_ext_specific: true,
 }
 
+cc_prebuilt_binary {
+	name: "batterysecret",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/batterysecret"],
+			shared_libs: ["libcutils", "libutils", "libbinder", "libbase", "liblog", "libhidlbase", "libhidltransport", "android.hardware.health@1.0", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "hvdcp_opti",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hvdcp_opti"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "vendor.qti.hardware.sensorscalibrate@1.0-service",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhidlbase", "vendor.qti.hardware.sensorscalibrate@1.0", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	relative_install_path: "hw",
+	soc_specific: true,
+}
+
+sh_binary {
+	name: "init.qcom.sensors",
+	owner: "xiaomi",
+	src: "proprietary/vendor/bin/init.qcom.sensors.sh",
+	filename: "init.qcom.sensors.sh",
+	soc_specific: true,
+}
+
+sh_binary {
+	name: "init.qti.chg_policy",
+	owner: "xiaomi",
+	src: "proprietary/vendor/bin/init.qti.chg_policy.sh",
+	filename: "init.qti.chg_policy.sh",
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "sensors.qti",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/sensors.qti"],
+			shared_libs: ["libprotobuf-cpp-lite-3.9.1-vendorcompat", "liblog", "libdiag", "libssc", "libsensorslog", "libcutils", "libsnsapi", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_binary {
+	name: "sscrpcd",
+	owner: "xiaomi",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/sscrpcd"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
diff --git a/cmi-vendor.mk b/cmi-vendor.mk
index 21f6719..f437f25 100644
--- a/cmi-vendor.mk
+++ b/cmi-vendor.mk
@@ -7,13 +7,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/cmi/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/batterysecret:$(TARGET_COPY_OUT_VENDOR)/bin/batterysecret \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/init.qcom.sensors.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.sensors.sh \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/init.qti.chg_policy.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.chg_policy.sh \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
-    vendor/xiaomi/cmi/proprietary/vendor/bin/sscrpcd:$(TARGET_COPY_OUT_VENDOR)/bin/sscrpcd \
     vendor/xiaomi/cmi/proprietary/vendor/etc/acdbdata/Tutu/Tutu_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Tutu/Tutu_Bluetooth_cal.acdb \
     vendor/xiaomi/cmi/proprietary/vendor/etc/acdbdata/Tutu/Tutu_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Tutu/Tutu_General_cal.acdb \
     vendor/xiaomi/cmi/proprietary/vendor/etc/acdbdata/Tutu/Tutu_Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Tutu/Tutu_Global_cal.acdb \
@@ -94,7 +87,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cmi/proprietary/vendor/etc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
     vendor/xiaomi/cmi/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
     vendor/xiaomi/cmi/proprietary/vendor/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/libnfc-nxp_RF.conf \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/calibratedCheck.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/calibratedCheck.json \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/config/ak991x_dri_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/ak991x_dri_0.json \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/config/bmp285_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmp285_0.json \
@@ -145,85 +137,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/config/vl53l1_tof_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/vl53l1_tof_0.json \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/judge_calibrated.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/judge_calibrated.json \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/descriptor.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/descriptor.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/nanopb.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/nanopb.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_accel.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_accel.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_accel_cal.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_accel_cal.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_activity_recognition.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_activity_recognition.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ambient_light.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ambient_light.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ambient_temperature.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ambient_temperature.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_amd.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_amd.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_aont.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_aont.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_basic_gestures.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_basic_gestures.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_bring_to_ear.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_bring_to_ear.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_cal.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_cal.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_cct.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_cct.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_client.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_client.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_cmc.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_cmc.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_da_test.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_da_test.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_device_mode.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_device_mode.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_device_orient.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_device_orient.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_diag.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_diag.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_diag_sensor.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_diag_sensor.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_direct_channel.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_direct_channel.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_dpc.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_dpc.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_eqm.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_eqm.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ext_svc.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ext_svc.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_facing.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_facing.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_flicker.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_flicker.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_fmv.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_fmv.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_formatter.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_formatter.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_free_fall.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_free_fall.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_fw.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_fw.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_game_rv.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_game_rv.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_geomag_rv.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_geomag_rv.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_gravity.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_gravity.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_gyro.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_gyro.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_gyro_cal.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_gyro_cal.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_gyro_rot_matrix.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_gyro_rot_matrix.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_hall.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_hall.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_har.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_har.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_heart_beat.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_heart_beat.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_heart_rate.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_heart_rate.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_hinge_angle.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_hinge_angle.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_humidity.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_humidity.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_mag.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_mag.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_mag_cal.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_mag_cal.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_oem1.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_oem1.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_oem15.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_oem15.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_oem2.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_oem2.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_oem3.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_oem3.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_offbody_detect.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_offbody_detect.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ois_manager.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ois_manager.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_pedometer.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_pedometer.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_pedometer_wrist.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_pedometer_wrist.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_oem_config.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_physical_sensor_oem_config.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_test.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_physical_sensor_test.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_pose_6dof.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_pose_6dof.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ppg.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ppg.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_pressure.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_pressure.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_proximity.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_proximity.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_psmd.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_psmd.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_registry.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_registry.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_resampler.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_resampler.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_rgb.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_rgb.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_rmd.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_rmd.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_rotv.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_rotv.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_sar.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_sar.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_sensor_temperature.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_sensor_temperature.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_sig_motion.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_sig_motion.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_std.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_std.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_std_event_gated_sensor.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_std_event_gated_sensor.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_std_sensor.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_std_sensor.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_std_type.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_std_type.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_step_detect.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_step_detect.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_suid.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_suid.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_thermopile.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_thermopile.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_threshold.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_threshold.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_tilt.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_tilt.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_tilt_to_wake.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_tilt_to_wake.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_ultra_violet.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ultra_violet.proto \
-    vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_wrist_tilt_gesture.proto \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/sensor_diag.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_diag.cfg \
     vendor/xiaomi/cmi/proprietary/vendor/etc/sensors/sns_reg_config:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sns_reg_config \
     vendor/xiaomi/cmi/proprietary/vendor/etc/thermal-4k.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-4k.conf \
@@ -276,82 +189,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cmi/proprietary/vendor/firmware/ipa_uc.b02:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_uc.b02 \
     vendor/xiaomi/cmi/proprietary/vendor/firmware/ipa_uc.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_uc.elf \
     vendor/xiaomi/cmi/proprietary/vendor/firmware/ipa_uc.mdt:$(TARGET_COPY_OUT_VENDOR)/firmware/ipa_uc.mdt \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/hw/audio.primary.kona.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/audio.primary.kona.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/liba2dpoffload.so:$(TARGET_COPY_OUT_VENDOR)/lib/liba2dpoffload.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libaudio_log_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudio_log_utils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libaudiocloudctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudiocloudctrl.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libaudioconfigstore.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudioconfigstore.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libaudioparsers.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudioparsers.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libaudioroute_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudioroute_ext.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxexternalformatutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxexternalformatutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxfacialfeatures.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxfacialfeatures.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxfdalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxfdalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxfdengine.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxfdengine.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxifestriping.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxifestriping.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamximageformatutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamximageformatutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxncs.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxncs.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxstatscore.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxstatscore.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxswprocessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxswprocessalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libcamxtintlessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxtintlessalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libhdmipassthru.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhdmipassthru.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/libresampler.so:$(TARGET_COPY_OUT_VENDOR)/lib/libresampler.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsn100u_fw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsn100u_fw.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/capi_v2_cirrus_sp.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_cirrus_sp.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/hrtf5c.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/hrtf5c.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libMIAIHDR_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libMIAIHDR_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libQ6MSFR_manager_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libQ6MSFR_manager_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libSuperSensor_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libSuperSensor_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libapps_mem_heap.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libarcsoft_hdrplus_hvx_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libarcsoft_hdrplus_hvx_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libbitml_nsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libbitml_nsp_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libcalculator_domains_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libcalculator_domains_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libcalculator_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libcalculator_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libcamera_nn_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libcamera_nn_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libcvpdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libcvpdsp_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libdspCV_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_binning.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libdsp_streamer_binning.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libfastcvadsp.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libfastcvdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libfastcvdsp_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libfrc_mobilenet.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libfrc_mobilenet.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libhexagon_nn_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libmobilenet_dsp.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libmobilenet_dsp.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libremosaichvx_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libremosaichvx_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libscveObjectSegmentation_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libscveT2T_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_domains_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsnpe_dsp_domains_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsnpe_dsp_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsns_device_mode_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libsns_low_lat_stream_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/misound_karaoke_res.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_karaoke_res.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/misound_karaokemix_res.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_karaokemix_res.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/rfsa/adsp/misound_res.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/vendor.qti.hardware.audiohalext@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.audiohalext@1.0.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib/vndk/libxlog.so:$(TARGET_COPY_OUT_VENDOR)/lib/vndk/libxlog.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.actuator.cmi_sunny_ultra_dw9800.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.actuator.cmi_sunny_ultra_dw9800.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64x.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64x.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5k2l7_m24c64x.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_s5k2l7_m24c64x.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128x.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128x.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c64.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_sunny_imx350_gt24p64b.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_sunny_imx350_gt24p64b.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.hawkeye_semco_ov48c_m24c64x.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.hawkeye_semco_ov48c_m24c64x.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.truly_cmb433.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.truly_cmb433.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.eeprom.umi_sunny_s5k5e8yx_depth.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.umi_sunny_s5k5e8yx_depth.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.cmi_s5k5e8yx_macro.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.cmi_s5k5e8yx_macro.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.imx350_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.imx350_cmi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.imx563.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.imx563.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.ov08a10_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.ov08a10_cmi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.ov48c_hawkeye.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.ov48c_hawkeye.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.s5k2l7_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.s5k2l7_cmi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.s5k3t2_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.s5k3t2_cmi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.s5khmx_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.s5khmx_cmi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensor.s5khmx_wide_cmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.s5khmx_wide_cmi.so \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensormodule.cmi_ofilm_s5k3t2.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.cmi_ofilm_s5k3t2.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensormodule.cmi_semco_ov08a10_tele4x_v1.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.cmi_semco_ov08a10_tele4x_v1.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.sensormodule.cmi_semco_s5k2l7_tele2x.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.cmi_semco_s5k2l7_tele2x.bin \
@@ -365,202 +202,275 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.tuned.cmi_semco_s5khmx_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.cmi_semco_s5khmx_wide.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.tuned.cmi_sunny_imx350_ultra_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.cmi_sunny_imx350_ultra_wide.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.default.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.arcsoft.node.deflicker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.arcsoft.node.deflicker.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.arcsoft.node.smoothtransition.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.arcsoft.node.smoothtransition.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.arcsoft.node.superportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.arcsoft.node.superportrait.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.facepp.node.siq.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.facepp.node.siq.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.AIIE.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.AIIE.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.aiasd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.aiasd.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.bodyslim.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.bodyslim.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.distortioncorrection.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.distortioncorrection.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.hdr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.hdr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.mimovie.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.mimovie.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.realtimebokeh.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.realtimebokeh.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.rearvideo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.rearvideo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.skinbeautifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.skinbeautifier.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.superlowlightraw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.superlowlightraw.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.videobokeh.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.videobokeh.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.mi.node.watermark.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.mi.node.watermark.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.camx.chiiqutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.camx.chiiqutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.eisv2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.eisv2.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.eisv3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.eisv3.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.hvx.addconstant.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.hvx.addconstant.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.hvx.binning.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.hvx.binning.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.customhwnode.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.customhwnode.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.depth.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.depth.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.dummyrtb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.dummyrtb.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.dummysat.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.dummysat.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.eisv2.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.eisv3.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.fcv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.fcv.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.gpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.gpu.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.ldc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.ldc.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.memcpy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.memcpy.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.remosaic.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.remosaic.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.softisppost.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.softisppost.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.stich.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.stich.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.node.swregistration.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.node.swregistration.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.aec.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.aecwrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.af.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.af.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.afd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.afd.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.afwrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.asd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.asd.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.awb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.awb.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.awbwrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.haf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.haf.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.hafoverride.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.hafoverride.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.pdlib.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.pdlibsony.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.pdlibwrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qti.stats.tracker.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qtistatic.stats.aec.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qtistatic.stats.af.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qtistatic.stats.awb.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.qtistatic.stats.pdlib.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.vidhance.node.eis.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.vidhance.node.eis.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.vidhance.stats.aec_dmbr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.xiaomi.node.mibokeh.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.xiaomi.node.mibokeh.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.xiaomi.node.mifilter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.xiaomi.node.mifilter.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.xiaomi.node.misegment.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.xiaomi.node.misegment.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/com.xiaomi.node.tracker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/com.xiaomi.node.tracker.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/libdepthmapwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/libdepthmapwrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/components/libubifocus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/components/libubifocus.so \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/fdconfigpreview.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreview.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/fdconfigpreviewlite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreviewlite.bin \
     vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/fdconfigvideo.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideo.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.anchorsync.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.anchorsync.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.demux.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.demux.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.frameselect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.frameselect.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.fusion.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.generic.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.generic.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.gs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.gs.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.hdr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.hdr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.memcpy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.memcpy.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.mfsr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.mfsr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.qcfa.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.qcfa.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.rawhdr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.rawhdr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.rawsupernight.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.rawsupernight.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.rt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.rt.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.serializer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.serializer.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.softispprocess.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.softispprocess.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.softispsupernight.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.softispsupernight.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.sr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.sr.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.stub.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/com.qti.feature2.swmf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.swmf.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/hw/camera.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.qcom.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qti.chi.override.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.goodix_fod.default.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libMIAIHDRhvx_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMIAIHDRhvx_interface.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libSNPE.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSNPE.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libalAILDC.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libalAILDC.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libalLDC.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libalLDC.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libalhLDC.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libalhLDC.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcdualcamsat.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcdualcamsat.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcmulticamsat.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcmulticamsat.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsat.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsat.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_beautyshot.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_beautyshot.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_bodyslim.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_bodyslim.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_distortion_correction.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_distortion_correction.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_dualcam_refocus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_dualcam_refocus.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_dualcam_refocus_front.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_dualcam_refocus_front.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_dualcam_refocus_rear_t.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_dualcam_refocus_rear_t.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_dualcam_refocus_rear_w.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_dualcam_refocus_rear_w.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_hdr_detection.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_hdr_detection.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_hdrplus_hvx_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_hdrplus_hvx_stub.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_high_dynamic_range.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_high_dynamic_range.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_portrait_lighting.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_portrait_lighting.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_portrait_lighting_c.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_portrait_lighting_c.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_preview_deflicker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_preview_deflicker.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_super_night_raw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_super_night_raw.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libarcsoft_superportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_superportrait.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libc++_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc++_shared.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamera_dirty.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_dirty.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamera_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_nn_stub.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamera_scene.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_scene.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamerapostproc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamerapostproc.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxexternalformatutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxexternalformatutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxfacialfeatures.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxfacialfeatures.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxfdalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxfdalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxfdengine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxfdengine.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxifestriping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxifestriping.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamximageformatutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamximageformatutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxncs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxncs.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxstatscore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxstatscore.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxswprocessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxswprocessalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcamxtintlessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxtintlessalgo.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcdsprpc_system.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsprpc_system.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libchilog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libchilog.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcom.qti.chinodeutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcom.qti.chinodeutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcvp2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvp2.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcvp2_hfi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvp2_hfi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcvp_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvp_common.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libcvpcpuRev_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcvpcpuRev_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libdng_sdk2vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdng_sdk2vendor.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libdualcam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_optical_zoom_control.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libdualcam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_video_optical_zoom.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libfocus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfocus.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libft2vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libft2vendor.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libgf_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgf_hal.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libhta.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhta.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libipebpsstriping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libipebpsstriping.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_ie_preview.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_ie_preview.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_image_colourkeeping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_image_colourkeeping.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_rfs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_rfs.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_sd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_sd.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_utils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_video_colourkeeping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_video_colourkeeping.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_video_enhance.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_video_enhance.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmialgo_video_seg.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmialgo_video_seg.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmibokeh_845_video.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmibokeh_845_video.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmibokeh_855.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmibokeh_855.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmpbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmpbase.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmulticam_image_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmulticam_image_optical_zoom.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmulticam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmulticam_optical_zoom_control.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libmulticam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmulticam_video_optical_zoom.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libnotifyaudiohal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnotifyaudiohal.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libnpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnpu.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libofflinelog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libofflinelog.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libos.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libos.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libremosaic_wrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libremosaic_wrapper.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libremosaichvx_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libremosaichvx_stub.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libremosaiclib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libremosaiclib.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsensorcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorcal.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsensorslog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorslog.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnpe_adsp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_adsp.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnpe_dsp_domains.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_dsp_domains.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnpe_dsp_domains_system.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_dsp_domains_system.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_dsp_domains_v2.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnpe_dsp_domains_v2_system.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_dsp_domains_v2_system.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsns_fastRPC_util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_fastRPC_util.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsns_low_lat_stream_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_low_lat_stream_stub.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsns_registry_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_registry_skel.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnsapi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsapi.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsnsdiaglog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsdiaglog.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libssc_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc_default_listener.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libst_soft_isp_calc_exposure_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libst_soft_isp_calc_exposure_shared.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libst_soft_isp_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libst_soft_isp_shared.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsymphony-cpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphony-cpu.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libsynx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsynx.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libthreadutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libthreadutils.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libtriplecam_optical_zoom_control.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_optical_zoom_control.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_video_optical_zoom.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libultrasound.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libultrasound.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libvideoBokeh.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvideoBokeh.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libvideofilter_only.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvideofilter_only.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libvidhance.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvidhance.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/libxmi_high_dynamic_range.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxmi_high_dynamic_range.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/sensors.elliptic.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.elliptic.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/sensors.mius.proximity.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.mius.proximity.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/sensors.touch.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.touch.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so \
-    vendor/xiaomi/cmi/proprietary/vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so
+    vendor/xiaomi/cmi/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin
 
 PRODUCT_PACKAGES += \
+    audio.primary.cmi \
+    liba2dpoffload_cmi \
+    libaudio_log_utils \
+    libaudiocloudctrl \
+    libaudioconfigstore \
+    libaudioparsers \
+    libaudioroute_ext \
+    libhdmipassthru \
+    libresampler \
+    vendor.qti.hardware.audiohalext@1.0 \
+    libxlog \
+    com.qti.actuator.cmi_sunny_ultra_dw9800 \
+    com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64 \
+    com.qti.eeprom.cmi_semco_ov08a10_m24c64 \
+    com.qti.eeprom.cmi_semco_ov08a10_m24c64x \
+    com.qti.eeprom.cmi_semco_s5k2l7_m24c64x \
+    com.qti.eeprom.cmi_semco_s5khmx_m24c128 \
+    com.qti.eeprom.cmi_semco_s5khmx_m24c128x \
+    com.qti.eeprom.cmi_semco_s5khmx_m24c64 \
+    com.qti.eeprom.cmi_sunny_imx350_gt24p64b \
+    com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64 \
+    com.qti.eeprom.hawkeye_semco_ov48c_m24c64x \
+    com.qti.eeprom.truly_cmb433 \
+    com.qti.eeprom.umi_sunny_s5k5e8yx_depth \
+    com.qti.sensor.cmi_s5k5e8yx_macro \
+    com.qti.sensor.imx350_cmi \
+    com.qti.sensor.imx563 \
+    com.qti.sensor.ov08a10_cmi \
+    com.qti.sensor.ov48c_hawkeye \
+    com.qti.sensor.s5k2l7_cmi \
+    com.qti.sensor.s5k3t2_cmi \
+    com.qti.sensor.s5khmx_cmi \
+    com.qti.sensor.s5khmx_wide_cmi \
+    com.arcsoft.node.deflicker \
+    com.arcsoft.node.smoothtransition \
+    com.arcsoft.node.superportrait \
+    com.facepp.node.siq \
+    com.mi.node.AIIE \
+    com.mi.node.aiasd \
+    com.mi.node.bodyslim \
+    com.mi.node.distortioncorrection \
+    com.mi.node.hdr \
+    com.mi.node.mimovie \
+    com.mi.node.realtimebokeh \
+    com.mi.node.rearvideo \
+    com.mi.node.skinbeautifier \
+    com.mi.node.superlowlightraw \
+    com.mi.node.videobokeh \
+    com.mi.node.watermark \
+    com.qti.camx.chiiqutils \
+    com.qti.eisv2 \
+    com.qti.eisv3 \
+    com.qti.hvx.addconstant \
+    com.qti.hvx.binning \
+    com.qti.node.customhwnode \
+    com.qti.node.depth \
+    com.qti.node.dummyrtb \
+    com.qti.node.dummysat \
+    com.qti.node.eisv2 \
+    com.qti.node.eisv3 \
+    com.qti.node.fcv \
+    com.qti.node.gpu \
+    com.qti.node.ldc \
+    com.qti.node.memcpy \
+    com.qti.node.remosaic \
+    com.qti.node.softisppost \
+    com.qti.node.stich \
+    com.qti.node.swregistration \
+    com.qti.stats.aec \
+    com.qti.stats.aecwrapper \
+    com.qti.stats.af \
+    com.qti.stats.afd \
+    com.qti.stats.afwrapper \
+    com.qti.stats.asd \
+    com.qti.stats.awb \
+    com.qti.stats.awbwrapper \
+    com.qti.stats.haf \
+    com.qti.stats.hafoverride \
+    com.qti.stats.pdlib \
+    com.qti.stats.pdlibsony \
+    com.qti.stats.pdlibwrapper \
+    com.qti.stats.tracker \
+    com.qtistatic.stats.aec \
+    com.qtistatic.stats.af \
+    com.qtistatic.stats.awb \
+    com.qtistatic.stats.pdlib \
+    com.vidhance.node.eis \
+    com.vidhance.stats.aec_dmbr \
+    com.xiaomi.node.mibokeh \
+    com.xiaomi.node.mifilter \
+    com.xiaomi.node.misegment \
+    com.xiaomi.node.tracker \
+    libdepthmapwrapper \
+    libubifocus \
+    com.qti.feature2.anchorsync \
+    com.qti.feature2.demux \
+    com.qti.feature2.frameselect \
+    com.qti.feature2.fusion \
+    com.qti.feature2.generic \
+    com.qti.feature2.gs \
+    com.qti.feature2.hdr \
+    com.qti.feature2.memcpy \
+    com.qti.feature2.mfsr \
+    com.qti.feature2.qcfa \
+    com.qti.feature2.rawhdr \
+    com.qti.feature2.rawsupernight \
+    com.qti.feature2.rt \
+    com.qti.feature2.serializer \
+    com.qti.feature2.softispprocess \
+    com.qti.feature2.softispsupernight \
+    com.qti.feature2.sr \
+    com.qti.feature2.stub \
+    com.qti.feature2.swmf \
+    camera.qcom \
+    com.qti.chi.override \
+    fingerprint.goodix_fod.default \
+    vendor.qti.hardware.sensorscalibrate@1.0-impl \
+    libMIAIHDRhvx_interface \
+    libSNPE \
+    libalAILDC \
+    libalLDC \
+    libalhLDC \
+    libarcdualcamsat \
+    libarcmulticamsat \
+    libarcsat \
+    libarcsoft_beautyshot \
+    libarcsoft_bodyslim \
+    libarcsoft_distortion_correction \
+    libarcsoft_dualcam_refocus \
+    libarcsoft_dualcam_refocus_front \
+    libarcsoft_dualcam_refocus_rear_t \
+    libarcsoft_dualcam_refocus_rear_w \
+    libarcsoft_hdr_detection \
+    libarcsoft_hdrplus_hvx_stub \
+    libarcsoft_high_dynamic_range \
+    libarcsoft_portrait_lighting \
+    libarcsoft_portrait_lighting_c \
+    libarcsoft_preview_deflicker \
+    libarcsoft_super_night_raw \
+    libarcsoft_superportrait \
+    libc++_shared \
+    libcamera_dirty \
+    libcamera_nn_stub \
+    libcamera_scene \
+    libcamerapostproc \
+    libcamxexternalformatutils \
+    libcamxfacialfeatures \
+    libcamxfdalgo \
+    libcamxfdengine \
+    libcamxifestriping \
+    libcamximageformatutils \
+    libcamxncs \
+    libcamxstatscore \
+    libcamxswprocessalgo \
+    libcamxtintlessalgo \
+    libchilog \
+    libcom.qti.chinodeutils \
+    libcvp2 \
+    libcvp2_hfi \
+    libcvp_common \
+    libcvpcpuRev_skel \
+    libdng_sdk2vendor \
+    libdualcam_optical_zoom_control \
+    libdualcam_video_optical_zoom \
+    libflaw \
+    libfocus \
+    libft2vendor \
+    libgf_hal \
+    libhta \
+    libipebpsstriping \
+    libmialgo_ie_preview \
+    libmialgo_image_colourkeeping \
+    libmialgo_rfs \
+    libmialgo_sd \
+    libmialgo_utils \
+    libmialgo_video_colourkeeping \
+    libmialgo_video_enhance \
+    libmialgo_video_seg \
+    libmibokeh_845_video \
+    libmibokeh_855 \
+    libmpbase \
+    libmulticam_image_optical_zoom \
+    libmulticam_optical_zoom_control \
+    libmulticam_video_optical_zoom \
+    libnotifyaudiohal \
+    libnpu \
+    libofflinelog \
+    libos \
+    libremosaic_wrapper \
+    libremosaichvx_stub \
+    libremosaiclib \
+    libsensorcal \
+    libsensorslog \
+    libsn100u_fw \
+    libsnpe_adsp \
+    libsnpe_dsp_domains \
+    libsnpe_dsp_domains_system \
+    libsnpe_dsp_domains_v2 \
+    libsnpe_dsp_domains_v2_system \
+    libsns_fastRPC_util \
+    libsns_low_lat_stream_stub \
+    libsns_registry_skel \
+    libsnsapi \
+    libsnsdiaglog \
+    libssc \
+    libssc_default_listener \
+    libst_soft_isp_calc_exposure_shared \
+    libst_soft_isp_shared \
+    libsymphony-cpu \
+    libsynx \
+    libthreadutils \
+    libtriplecam_optical_zoom_control \
+    libtriplecam_video_optical_zoom \
+    libultrasound \
+    libvideoBokeh \
+    libvideofilter_only \
+    libvidhance \
+    libxmi_high_dynamic_range \
+    sensors.elliptic \
+    sensors.mius.proximity \
+    sensors.ssc \
+    sensors.touch \
+    vendor.qti.hardware.camera.postproc@1.0-service-impl \
+    vendor.qti.hardware.sensorscalibrate@1.0 \
+    capi_v2_cirrus_sp \
+    hrtf5c \
+    libMIAIHDR_skel \
+    libQ6MSFR_manager_skel \
+    libSuperSensor_skel \
+    libapps_mem_heap \
+    libarcsoft_hdrplus_hvx_skel \
+    libbitml_nsp_skel \
+    libcalculator_domains_skel \
+    libcalculator_skel \
+    libcamera_nn_skel \
+    libcvpdsp_skel \
+    libdspCV_skel \
+    libdsp_streamer_binning \
+    libfastcvadsp \
+    libfastcvdsp_skel \
+    libfrc_mobilenet \
+    libhexagon_nn_skel \
+    libmialgo_rfs_cdsp_skel \
+    libmobilenet_dsp \
+    libremosaichvx_skel \
+    libscveObjectSegmentation_skel \
+    libscveT2T_skel \
+    libsnpe_dsp_domains_skel \
+    libsnpe_dsp_skel \
+    libsnpe_dsp_v65_domains_v2_skel \
+    libsnpe_dsp_v66_domains_v2_skel \
+    libsns_device_mode_skel \
+    libsns_low_lat_stream_skel \
+    misound_karaoke_res \
+    misound_karaokemix_res \
+    misound_res \
     HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
     HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
-    com.android.hotwordenrollment.common.util
+    com.android.hotwordenrollment.common.util \
+    batterysecret \
+    hvdcp_opti \
+    vendor.qti.hardware.sensorscalibrate@1.0-service \
+    init.qcom.sensors \
+    init.qti.chg_policy \
+    sensors.qti \
+    sscrpcd
diff --git a/proprietary/vendor/bin/batterysecret b/proprietary/vendor/bin/batterysecret
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/hvdcp_opti b/proprietary/vendor/bin/hvdcp_opti
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/init.qcom.sensors.sh b/proprietary/vendor/bin/init.qcom.sensors.sh
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/init.qti.chg_policy.sh b/proprietary/vendor/bin/init.qti.chg_policy.sh
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/sensors.qti b/proprietary/vendor/bin/sensors.qti
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/sscrpcd b/proprietary/vendor/bin/sscrpcd
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml b/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml
deleted file mode 100644
index 9284b0a..0000000
--- a/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-    Copyright (c) 2017 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
- -->
-<permissions>
-    <library name="vendor.qti.hardware.sensorscalibrate-V1.0"
-          file="/system/framework/vendor.qti.hardware.sensorscalibrate-V1.0-java.jar"/>
-</permissions>
-
diff --git a/proprietary/vendor/etc/sensors/proto/descriptor.proto b/proprietary/vendor/etc/sensors/proto/descriptor.proto
deleted file mode 100644
index a2102d7..0000000
--- a/proprietary/vendor/etc/sensors/proto/descriptor.proto
+++ /dev/null
@@ -1,885 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// The messages in this file describe the definitions found in .proto files.
-// A valid .proto file can be translated directly to a FileDescriptorProto
-// without any other information (e.g. without reading its imports).
-
-
-syntax = "proto2";
-
-package google.protobuf;
-
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// descriptor.proto must be optimized for speed because reflection-based
-// algorithms don't work during bootstrapping.
-option optimize_for = SPEED;
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-message FileDescriptorSet {
-  repeated FileDescriptorProto file = 1;
-}
-
-// Describes a complete .proto file.
-message FileDescriptorProto {
-  optional string name = 1;     // file name, relative to root of source tree
-  optional string package = 2;  // e.g. "foo", "foo.bar", etc.
-
-  // Names of files imported by this file.
-  repeated string dependency = 3;
-  // Indexes of the public imported files in the dependency list above.
-  repeated int32 public_dependency = 10;
-  // Indexes of the weak imported files in the dependency list.
-  // For Google-internal migration only. Do not use.
-  repeated int32 weak_dependency = 11;
-
-  // All top-level definitions in this file.
-  repeated DescriptorProto message_type = 4;
-  repeated EnumDescriptorProto enum_type = 5;
-  repeated ServiceDescriptorProto service = 6;
-  repeated FieldDescriptorProto extension = 7;
-
-  optional FileOptions options = 8;
-
-  // This field contains optional information about the original source code.
-  // You may safely remove this entire field without harming runtime
-  // functionality of the descriptors -- the information is needed only by
-  // development tools.
-  optional SourceCodeInfo source_code_info = 9;
-
-  // The syntax of the proto file.
-  // The supported values are "proto2" and "proto3".
-  optional string syntax = 12;
-}
-
-// Describes a message type.
-message DescriptorProto {
-  optional string name = 1;
-
-  repeated FieldDescriptorProto field = 2;
-  repeated FieldDescriptorProto extension = 6;
-
-  repeated DescriptorProto nested_type = 3;
-  repeated EnumDescriptorProto enum_type = 4;
-
-  message ExtensionRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-
-    optional ExtensionRangeOptions options = 3;
-  }
-  repeated ExtensionRange extension_range = 5;
-
-  repeated OneofDescriptorProto oneof_decl = 8;
-
-  optional MessageOptions options = 7;
-
-  // Range of reserved tag numbers. Reserved tag numbers may not be used by
-  // fields or extension ranges in the same message. Reserved ranges may
-  // not overlap.
-  message ReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-  }
-  repeated ReservedRange reserved_range = 9;
-  // Reserved field names, which may not be used by fields in the same message.
-  // A given name may only be reserved once.
-  repeated string reserved_name = 10;
-}
-
-message ExtensionRangeOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// Describes a field within a message.
-message FieldDescriptorProto {
-  enum Type {
-    // 0 is reserved for errors.
-    // Order is weird for historical reasons.
-    TYPE_DOUBLE = 1;
-    TYPE_FLOAT = 2;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-    // negative values are likely.
-    TYPE_INT64 = 3;
-    TYPE_UINT64 = 4;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-    // negative values are likely.
-    TYPE_INT32 = 5;
-    TYPE_FIXED64 = 6;
-    TYPE_FIXED32 = 7;
-    TYPE_BOOL = 8;
-    TYPE_STRING = 9;
-    // Tag-delimited aggregate.
-    // Group type is deprecated and not supported in proto3. However, Proto3
-    // implementations should still be able to parse the group wire format and
-    // treat group fields as unknown fields.
-    TYPE_GROUP = 10;
-    TYPE_MESSAGE = 11;  // Length-delimited aggregate.
-
-    // New in version 2.
-    TYPE_BYTES = 12;
-    TYPE_UINT32 = 13;
-    TYPE_ENUM = 14;
-    TYPE_SFIXED32 = 15;
-    TYPE_SFIXED64 = 16;
-    TYPE_SINT32 = 17;  // Uses ZigZag encoding.
-    TYPE_SINT64 = 18;  // Uses ZigZag encoding.
-  }
-
-  enum Label {
-    // 0 is reserved for errors
-    LABEL_OPTIONAL = 1;
-    LABEL_REQUIRED = 2;
-    LABEL_REPEATED = 3;
-  }
-
-  optional string name = 1;
-  optional int32 number = 3;
-  optional Label label = 4;
-
-  // If type_name is set, this need not be set.  If both this and type_name
-  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-  optional Type type = 5;
-
-  // For message and enum types, this is the name of the type.  If the name
-  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-  // rules are used to find the type (i.e. first the nested types within this
-  // message are searched, then within the parent, on up to the root
-  // namespace).
-  optional string type_name = 6;
-
-  // For extensions, this is the name of the type being extended.  It is
-  // resolved in the same manner as type_name.
-  optional string extendee = 2;
-
-  // For numeric types, contains the original text representation of the value.
-  // For booleans, "true" or "false".
-  // For strings, contains the default text contents (not escaped in any way).
-  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
-  optional string default_value = 7;
-
-  // If set, gives the index of a oneof in the containing type's oneof_decl
-  // list.  This field is a member of that oneof.
-  optional int32 oneof_index = 9;
-
-  // JSON name of this field. The value is set by protocol compiler. If the
-  // user has set a "json_name" option on this field, that option's value
-  // will be used. Otherwise, it's deduced from the field's name by converting
-  // it to camelCase.
-  optional string json_name = 10;
-
-  optional FieldOptions options = 8;
-}
-
-// Describes a oneof.
-message OneofDescriptorProto {
-  optional string name = 1;
-  optional OneofOptions options = 2;
-}
-
-// Describes an enum type.
-message EnumDescriptorProto {
-  optional string name = 1;
-
-  repeated EnumValueDescriptorProto value = 2;
-
-  optional EnumOptions options = 3;
-
-  // Range of reserved numeric values. Reserved values may not be used by
-  // entries in the same enum. Reserved ranges may not overlap.
-  //
-  // Note that this is distinct from DescriptorProto.ReservedRange in that it
-  // is inclusive such that it can appropriately represent the entire int32
-  // domain.
-  message EnumReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Inclusive.
-  }
-
-  // Range of reserved numeric values. Reserved numeric values may not be used
-  // by enum values in the same enum declaration. Reserved ranges may not
-  // overlap.
-  repeated EnumReservedRange reserved_range = 4;
-
-  // Reserved enum value names, which may not be reused. A given name may only
-  // be reserved once.
-  repeated string reserved_name = 5;
-}
-
-// Describes a value within an enum.
-message EnumValueDescriptorProto {
-  optional string name = 1;
-  optional int32 number = 2;
-
-  optional EnumValueOptions options = 3;
-}
-
-// Describes a service.
-message ServiceDescriptorProto {
-  optional string name = 1;
-  repeated MethodDescriptorProto method = 2;
-
-  optional ServiceOptions options = 3;
-}
-
-// Describes a method of a service.
-message MethodDescriptorProto {
-  optional string name = 1;
-
-  // Input and output type names.  These are resolved in the same way as
-  // FieldDescriptorProto.type_name, but must refer to a message type.
-  optional string input_type = 2;
-  optional string output_type = 3;
-
-  optional MethodOptions options = 4;
-
-  // Identifies if client streams multiple client messages
-  optional bool client_streaming = 5 [default = false];
-  // Identifies if server streams multiple server messages
-  optional bool server_streaming = 6 [default = false];
-}
-
-
-// ===================================================================
-// Options
-
-// Each of the definitions above may have "options" attached.  These are
-// just annotations which may cause code to be generated slightly differently
-// or may contain hints for code that manipulates protocol messages.
-//
-// Clients may define custom options as extensions of the *Options messages.
-// These extensions may not yet be known at parsing time, so the parser cannot
-// store the values in them.  Instead it stores them in a field in the *Options
-// message called uninterpreted_option. This field must have the same name
-// across all *Options messages. We then use this field to populate the
-// extensions when we build a descriptor, at which point all protos have been
-// parsed and so all extensions are known.
-//
-// Extension numbers for custom options may be chosen as follows:
-// * For options which will only be used within a single application or
-//   organization, or for experimental options, use field numbers 50000
-//   through 99999.  It is up to you to ensure that you do not use the
-//   same number for multiple options.
-// * For options which will be published and used publicly by multiple
-//   independent entities, e-mail protobuf-global-extension-registry@google.com
-//   to reserve extension numbers. Simply provide your project name (e.g.
-//   Objective-C plugin) and your project website (if available) -- there's no
-//   need to explain how you intend to use them. Usually you only need one
-//   extension number. You can declare multiple options with only one extension
-//   number by putting them in a sub-message. See the Custom Options section of
-//   the docs for examples:
-//   https://developers.google.com/protocol-buffers/docs/proto#options
-//   If this turns out to be popular, a web service will be set up
-//   to automatically assign option numbers.
-
-message FileOptions {
-
-  // Sets the Java package where classes generated from this .proto will be
-  // placed.  By default, the proto package is used, but this is often
-  // inappropriate because proto packages do not normally start with backwards
-  // domain names.
-  optional string java_package = 1;
-
-
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
-  optional string java_outer_classname = 8;
-
-  // If set true, then the Java code generator will generate a separate .java
-  // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
-  // generated to contain the file's getDescriptor() method as well as any
-  // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default = false];
-
-  // This option does nothing.
-  optional bool java_generate_equals_and_hash = 20 [deprecated=true];
-
-  // If set true, then the Java2 code generator will generate code that
-  // throws an exception whenever an attempt is made to assign a non-UTF-8
-  // byte sequence to a string field.
-  // Message reflection will do the same.
-  // However, an extension field still accepts non-UTF-8 byte sequences.
-  // This option has no effect on when used with the lite runtime.
-  optional bool java_string_check_utf8 = 27 [default = false];
-
-
-  // Generated classes can be optimized for speed or code size.
-  enum OptimizeMode {
-    SPEED = 1;         // Generate complete code for parsing, serialization,
-                       // etc.
-    CODE_SIZE = 2;     // Use ReflectionOps to implement these methods.
-    LITE_RUNTIME = 3;  // Generate code using MessageLite and the lite runtime.
-  }
-  optional OptimizeMode optimize_for = 9 [default = SPEED];
-
-  // Sets the Go package where structs generated from this .proto will be
-  // placed. If omitted, the Go package will be derived from the following:
-  //   - The basename of the package import path, if provided.
-  //   - Otherwise, the package statement in the .proto file, if present.
-  //   - Otherwise, the basename of the .proto file, without extension.
-  optional string go_package = 11;
-
-
-
-
-  // Should generic services be generated in each language?  "Generic" services
-  // are not specific to any particular RPC system.  They are generated by the
-  // main code generators in each language (without additional plugins).
-  // Generic services were the only kind of service generation supported by
-  // early versions of google.protobuf.
-  //
-  // Generic services are now considered deprecated in favor of using plugins
-  // that generate code specific to your particular RPC system.  Therefore,
-  // these default to false.  Old code which depends on generic services should
-  // explicitly set them to true.
-  optional bool cc_generic_services = 16 [default = false];
-  optional bool java_generic_services = 17 [default = false];
-  optional bool py_generic_services = 18 [default = false];
-  optional bool php_generic_services = 42 [default = false];
-
-  // Is this file deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for everything in the file, or it will be completely ignored; in the very
-  // least, this is a formalization for deprecating files.
-  optional bool deprecated = 23 [default = false];
-
-  // Enables the use of arenas for the proto messages in this file. This applies
-  // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default = false];
-
-
-  // Sets the objective c class prefix which is prepended to all objective c
-  // generated classes from this .proto. There is no default.
-  optional string objc_class_prefix = 36;
-
-  // Namespace for generated classes; defaults to the package.
-  optional string csharp_namespace = 37;
-
-  // By default Swift generators will take the proto package and CamelCase it
-  // replacing '.' with underscore and use that to prefix the types/symbols
-  // defined. When this options is provided, they will use this value instead
-  // to prefix the types/symbols defined.
-  optional string swift_prefix = 39;
-
-  // Sets the php class prefix which is prepended to all php generated classes
-  // from this .proto. Default is empty.
-  optional string php_class_prefix = 40;
-
-  // Use this option to change the namespace of php generated classes. Default
-  // is empty. When this option is empty, the package name will be used for
-  // determining the namespace.
-  optional string php_namespace = 41;
-
-  // Use this option to change the namespace of php generated metadata classes.
-  // Default is empty. When this option is empty, the proto file name will be
-  // used for determining the namespace.
-  optional string php_metadata_namespace = 44;
-
-  // Use this option to change the package of ruby generated classes. Default
-  // is empty. When this option is not set, the package name will be used for
-  // determining the ruby package.
-  optional string ruby_package = 45;
-
-
-  // The parser stores options it doesn't recognize here.
-  // See the documentation for the "Options" section above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message.
-  // See the documentation for the "Options" section above.
-  extensions 1000 to max;
-
-  reserved 38;
-}
-
-message MessageOptions {
-  // Set true to use the old proto1 MessageSet wire format for extensions.
-  // This is provided for backwards-compatibility with the MessageSet wire
-  // format.  You should not use this for any other reason:  It's less
-  // efficient, has fewer features, and is more complicated.
-  //
-  // The message must be defined exactly as follows:
-  //   message Foo {
-  //     option message_set_wire_format = true;
-  //     extensions 4 to max;
-  //   }
-  // Note that the message cannot have any defined fields; MessageSets only
-  // have extensions.
-  //
-  // All extensions of your type must be singular messages; e.g. they cannot
-  // be int32s, enums, or repeated messages.
-  //
-  // Because this is an option, the above two restrictions are not enforced by
-  // the protocol compiler.
-  optional bool message_set_wire_format = 1 [default = false];
-
-  // Disables the generation of the standard "descriptor()" accessor, which can
-  // conflict with a field of the same name.  This is meant to make migration
-  // from proto1 easier; new code should avoid fields named "descriptor".
-  optional bool no_standard_descriptor_accessor = 2 [default = false];
-
-  // Is this message deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the message, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating messages.
-  optional bool deprecated = 3 [default = false];
-
-  // Whether the message is an automatically generated map entry type for the
-  // maps field.
-  //
-  // For maps fields:
-  //     map<KeyType, ValueType> map_field = 1;
-  // The parsed descriptor looks like:
-  //     message MapFieldEntry {
-  //         option map_entry = true;
-  //         optional KeyType key = 1;
-  //         optional ValueType value = 2;
-  //     }
-  //     repeated MapFieldEntry map_field = 1;
-  //
-  // Implementations may choose not to generate the map_entry=true message, but
-  // use a native map in the target language to hold the keys and values.
-  // The reflection APIs in such implementations still need to work as
-  // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
-  optional bool map_entry = 7;
-
-  reserved 8;  // javalite_serializable
-  reserved 9;  // javanano_as_lite
-
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message FieldOptions {
-  // The ctype option instructs the C++ code generator to use a different
-  // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
-  optional CType ctype = 1 [default = STRING];
-  enum CType {
-    // Default mode.
-    STRING = 0;
-
-    CORD = 1;
-
-    STRING_PIECE = 2;
-  }
-  // The packed option can be enabled for repeated primitive fields to enable
-  // a more efficient representation on the wire. Rather than repeatedly
-  // writing the tag and type for each element, the entire array is encoded as
-  // a single length-delimited blob. In proto3, only explicit setting it to
-  // false will avoid using packed encoding.
-  optional bool packed = 2;
-
-  // The jstype option determines the JavaScript type used for values of the
-  // field.  The option is permitted only for 64 bit integral and fixed types
-  // (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-  // is represented as JavaScript string, which avoids loss of precision that
-  // can happen when a large value is converted to a floating point JavaScript.
-  // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-  // use the JavaScript "number" type.  The behavior of the default option
-  // JS_NORMAL is implementation dependent.
-  //
-  // This option is an enum to permit additional types to be added, e.g.
-  // goog.math.Integer.
-  optional JSType jstype = 6 [default = JS_NORMAL];
-  enum JSType {
-    // Use the default type.
-    JS_NORMAL = 0;
-
-    // Use JavaScript strings.
-    JS_STRING = 1;
-
-    // Use JavaScript numbers.
-    JS_NUMBER = 2;
-  }
-
-  // Should this field be parsed lazily?  Lazy applies only to message-type
-  // fields.  It means that when the outer message is initially parsed, the
-  // inner message's contents will not be parsed but instead stored in encoded
-  // form.  The inner message will actually be parsed when it is first accessed.
-  //
-  // This is only a hint.  Implementations are free to choose whether to use
-  // eager or lazy parsing regardless of the value of this option.  However,
-  // setting this option true suggests that the protocol author believes that
-  // using lazy parsing on this field is worth the additional bookkeeping
-  // overhead typically needed to implement it.
-  //
-  // This option does not affect the public interface of any generated code;
-  // all method signatures remain the same.  Furthermore, thread-safety of the
-  // interface is not affected by this option; const methods remain safe to
-  // call from multiple threads concurrently, while non-const methods continue
-  // to require exclusive access.
-  //
-  //
-  // Note that implementations may choose not to check required fields within
-  // a lazy sub-message.  That is, calling IsInitialized() on the outer message
-  // may return true even if the inner message has missing required fields.
-  // This is necessary because otherwise the inner message would have to be
-  // parsed in order to perform the check, defeating the purpose of lazy
-  // parsing.  An implementation which chooses not to check required fields
-  // must be consistent about it.  That is, for any particular sub-message, the
-  // implementation must either *always* check its required fields, or *never*
-  // check its required fields, regardless of whether or not the message has
-  // been parsed.
-  optional bool lazy = 5 [default = false];
-
-  // Is this field deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for accessors, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating fields.
-  optional bool deprecated = 3 [default = false];
-
-  // For Google-internal migration only. Do not use.
-  optional bool weak = 10 [default = false];
-
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 4;  // removed jtype
-}
-
-message OneofOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumOptions {
-
-  // Set this option to true to allow mapping different tag names to the same
-  // value.
-  optional bool allow_alias = 2;
-
-  // Is this enum deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating enums.
-  optional bool deprecated = 3 [default = false];
-
-  reserved 5;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumValueOptions {
-  // Is this enum value deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum value, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating enum values.
-  optional bool deprecated = 1 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message ServiceOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this service deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the service, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating services.
-  optional bool deprecated = 33 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message MethodOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this method deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the method, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating methods.
-  optional bool deprecated = 33 [default = false];
-
-  // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-  // or neither? HTTP based RPC implementation may choose GET verb for safe
-  // methods, and PUT verb for idempotent methods instead of the default POST.
-  enum IdempotencyLevel {
-    IDEMPOTENCY_UNKNOWN = 0;
-    NO_SIDE_EFFECTS = 1;  // implies idempotent
-    IDEMPOTENT = 2;       // idempotent, but may have side effects
-  }
-  optional IdempotencyLevel idempotency_level = 34
-      [default = IDEMPOTENCY_UNKNOWN];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-message UninterpretedOption {
-  // The name of the uninterpreted option.  Each string represents a segment in
-  // a dot-separated name.  is_extension is true iff a segment represents an
-  // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
-  message NamePart {
-    required string name_part = 1;
-    required bool is_extension = 2;
-  }
-  repeated NamePart name = 2;
-
-  // The value of the uninterpreted option, in whatever type the tokenizer
-  // identified it as during parsing. Exactly one of these should be set.
-  optional string identifier_value = 3;
-  optional uint64 positive_int_value = 4;
-  optional int64 negative_int_value = 5;
-  optional double double_value = 6;
-  optional bytes string_value = 7;
-  optional string aggregate_value = 8;
-}
-
-// ===================================================================
-// Optional source code info
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-message SourceCodeInfo {
-  // A Location identifies a piece of source code in a .proto file which
-  // corresponds to a particular definition.  This information is intended
-  // to be useful to IDEs, code indexers, documentation generators, and similar
-  // tools.
-  //
-  // For example, say we have a file like:
-  //   message Foo {
-  //     optional string foo = 1;
-  //   }
-  // Let's look at just the field definition:
-  //   optional string foo = 1;
-  //   ^       ^^     ^^  ^  ^^^
-  //   a       bc     de  f  ghi
-  // We have the following locations:
-  //   span   path               represents
-  //   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-  //   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-  //   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-  //   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-  //   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-  //
-  // Notes:
-  // - A location may refer to a repeated field itself (i.e. not to any
-  //   particular index within it).  This is used whenever a set of elements are
-  //   logically enclosed in a single code segment.  For example, an entire
-  //   extend block (possibly containing multiple extension definitions) will
-  //   have an outer location whose path refers to the "extensions" repeated
-  //   field without an index.
-  // - Multiple locations may have the same path.  This happens when a single
-  //   logical declaration is spread out across multiple places.  The most
-  //   obvious example is the "extend" block again -- there may be multiple
-  //   extend blocks in the same scope, each of which will have the same path.
-  // - A location's span is not always a subset of its parent's span.  For
-  //   example, the "extendee" of an extension declaration appears at the
-  //   beginning of the "extend" block and is shared by all extensions within
-  //   the block.
-  // - Just because a location's span is a subset of some other location's span
-  //   does not mean that it is a descendant.  For example, a "group" defines
-  //   both a type and a field in a single declaration.  Thus, the locations
-  //   corresponding to the type and field and their components will overlap.
-  // - Code which tries to interpret locations should probably be designed to
-  //   ignore those that it doesn't understand, as more types of locations could
-  //   be recorded in the future.
-  repeated Location location = 1;
-  message Location {
-    // Identifies which part of the FileDescriptorProto was defined at this
-    // location.
-    //
-    // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
-    //   [ 4, 3, 2, 7, 1 ]
-    // refers to:
-    //   file.message_type(3)  // 4, 3
-    //       .field(7)         // 2, 7
-    //       .name()           // 1
-    // This is because FileDescriptorProto.message_type has field number 4:
-    //   repeated DescriptorProto message_type = 4;
-    // and DescriptorProto.field has field number 2:
-    //   repeated FieldDescriptorProto field = 2;
-    // and FieldDescriptorProto.name has field number 1:
-    //   optional string name = 1;
-    //
-    // Thus, the above path gives the location of a field name.  If we removed
-    // the last element:
-    //   [ 4, 3, 2, 7 ]
-    // this path refers to the whole field declaration (from the beginning
-    // of the label to the terminating semicolon).
-    repeated int32 path = 1 [packed = true];
-
-    // Always has exactly three or four elements: start line, start column,
-    // end line (optional, otherwise assumed same as start line), end column.
-    // These are packed into a single field for efficiency.  Note that line
-    // and column numbers are zero-based -- typically you will want to add
-    // 1 to each before displaying to a user.
-    repeated int32 span = 2 [packed = true];
-
-    // If this SourceCodeInfo represents a complete declaration, these are any
-    // comments appearing before and after the declaration which appear to be
-    // attached to the declaration.
-    //
-    // A series of line comments appearing on consecutive lines, with no other
-    // tokens appearing on those lines, will be treated as a single comment.
-    //
-    // leading_detached_comments will keep paragraphs of comments that appear
-    // before (but not connected to) the current element. Each paragraph,
-    // separated by empty lines, will be one comment element in the repeated
-    // field.
-    //
-    // Only the comment content is provided; comment markers (e.g. //) are
-    // stripped out.  For block comments, leading whitespace and an asterisk
-    // will be stripped from the beginning of each line other than the first.
-    // Newlines are included in the output.
-    //
-    // Examples:
-    //
-    //   optional int32 foo = 1;  // Comment attached to foo.
-    //   // Comment attached to bar.
-    //   optional int32 bar = 2;
-    //
-    //   optional string baz = 3;
-    //   // Comment attached to baz.
-    //   // Another line attached to baz.
-    //
-    //   // Comment attached to qux.
-    //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
-    //
-    //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
-    //   // both.
-    //
-    //   // Detached comment for corge paragraph 2.
-    //
-    //   optional string corge = 5;
-    //   /* Block comment attached
-    //    * to corge.  Leading asterisks
-    //    * will be removed. */
-    //   /* Block comment attached to
-    //    * grault. */
-    //   optional int32 grault = 6;
-    //
-    //   // ignored detached comments.
-    optional string leading_comments = 3;
-    optional string trailing_comments = 4;
-    repeated string leading_detached_comments = 6;
-  }
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-message GeneratedCodeInfo {
-  // An Annotation connects some span of text in generated code to an element
-  // of its generating .proto file.
-  repeated Annotation annotation = 1;
-  message Annotation {
-    // Identifies the element in the original source .proto file. This field
-    // is formatted the same as SourceCodeInfo.Location.path.
-    repeated int32 path = 1 [packed = true];
-
-    // Identifies the filesystem path to the original source .proto.
-    optional string source_file = 2;
-
-    // Identifies the starting offset in bytes in the generated code
-    // that relates to the identified object.
-    optional int32 begin = 3;
-
-    // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
-    // the last relevant byte (so the length of the text = end - begin).
-    optional int32 end = 4;
-  }
-}
diff --git a/proprietary/vendor/etc/sensors/proto/nanopb.proto b/proprietary/vendor/etc/sensors/proto/nanopb.proto
deleted file mode 100644
index 9b2f0fb..0000000
--- a/proprietary/vendor/etc/sensors/proto/nanopb.proto
+++ /dev/null
@@ -1,97 +0,0 @@
-// Custom options for defining:
-// - Maximum size of string/bytes
-// - Maximum number of elements in array
-//
-// These are used by nanopb to generate statically allocable structures
-// for memory-limited environments.
-
-syntax = "proto2";
-import "google/protobuf/descriptor.proto";
-
-option java_package = "fi.kapsi.koti.jpa.nanopb";
-
-enum FieldType {
-    FT_DEFAULT = 0; // Automatically decide field type, generate static field if possible.
-    FT_CALLBACK = 1; // Always generate a callback field.
-    FT_POINTER = 4; // Always generate a dynamically allocated field.
-    FT_STATIC = 2; // Generate a static field or raise an exception if not possible.
-    FT_IGNORE = 3; // Ignore the field completely.
-}
-
-enum IntSize {
-    IS_DEFAULT = 0; // Default, 32/64bit based on type in .proto
-    IS_8 = 8;
-    IS_16 = 16;
-    IS_32 = 32;
-    IS_64 = 64;
-}
-
-// This is the inner options message, which basically defines options for
-// a field. When it is used in message or file scope, it applies to all
-// fields.
-message NanoPBOptions {
-  // Allocated size for 'bytes' and 'string' fields.
-  optional int32 max_size = 1;
-  
-  // Allocated number of entries in arrays ('repeated' fields)
-  optional int32 max_count = 2;
-  
-  // Size of integer fields. Can save some memory if you don't need
-  // full 32 bits for the value.
-  optional IntSize int_size = 7 [default = IS_DEFAULT];
-
-  // Force type of field (callback or static allocation)
-  optional FieldType type = 3 [default = FT_DEFAULT];
-  
-  // Use long names for enums, i.e. EnumName_EnumValue.
-  optional bool long_names = 4 [default = true];
-  
-  // Add 'packed' attribute to generated structs.
-  // Note: this cannot be used on CPUs that break on unaligned
-  // accesses to variables.
-  optional bool packed_struct = 5 [default = false];
-  
-  // Add 'packed' attribute to generated enums.
-  optional bool packed_enum = 10 [default = false];
-  
-  // Skip this message
-  optional bool skip_message = 6 [default = false];
-
-  // Generate oneof fields as normal optional fields instead of union.
-  optional bool no_unions = 8 [default = false];
-
-  // integer type tag for a message
-  optional uint32 msgid = 9;
-
-  // decode oneof as anonymous union
-  optional bool anonymous_oneof = 11 [default = false];
-}
-
-// Extensions to protoc 'Descriptor' type in order to define options
-// inside a .proto file.
-//
-// Protocol Buffers extension number registry
-// --------------------------------
-// Project:  Nanopb
-// Contact:  Petteri Aimonen <jpa@kapsi.fi>
-// Web site: http://kapsi.fi/~jpa/nanopb
-// Extensions: 1010 (all types)
-// --------------------------------
-
-extend google.protobuf.FileOptions {
-    optional NanoPBOptions nanopb_fileopt = 1010;
-}
-
-extend google.protobuf.MessageOptions {
-    optional NanoPBOptions nanopb_msgopt = 1010;
-}
-
-extend google.protobuf.EnumOptions {
-    optional NanoPBOptions nanopb_enumopt = 1010;
-}
-
-extend google.protobuf.FieldOptions {
-    optional NanoPBOptions nanopb = 1010;
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_accel.proto b/proprietary/vendor/etc/sensors/proto/sns_accel.proto
deleted file mode 100644
index 5255029..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_accel.proto
+++ /dev/null
@@ -1,103 +0,0 @@
-// @file sns_accel.proto
-//
-// Defines the API for Accelerometer Sensors.
-// All Accelerometer Sensor drivers are required to comply with this API.
-// Any new functionality for Accelerometer Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_std_event_gated_sensor.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Accelerometer Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "accel".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute values in (m/s2)/LSB unit.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in +/-m/s2 unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Accelerometer Sensor handles the sns_std_sensor_config
-//    message request with msgid SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG
-//    for all non-gated stream enable/update requests.
-// 2. The Accelerometer Sensor handles the sns_std_sensor_config
-//    message request with msgid SNS_STD_EVENT_GATED_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG
-//    for all gated stream enable/update requests.
-//    a. Accelerometer stream is gated on the motion detection feature
-//       available on most accel hardware. This feature is published via the
-//       "motion_detect" Sensor by the same driver library as "accel" Sensor.
-//    b. If "motion_detect" is not supported then the Sensor does not support
-//       stream gating. Any gated client request is rejected in this case.
-// 3. The Accelerometer Sensor uses batching_period item in
-//    sns_std_request as the requested batching rate to determine
-//    hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Accelerometer Sensor publishes acceleration data stream events
-//    using the sns_std_sensor_event message.
-// 2. Each stream event contains three output data fields where data is
-//    in m/s2 units and is factory calibrated.
-// 3. Data in the stream is adjusted to Android coordinate system relative to a
-//    mobile device held with screen facing the user in it's natural orientation:
-//    X-axis: parallel to the screen pointing to the right
-//    Y-axis: parallel to the screen pointing to the top
-//    Z-axis: perpendicular to the screen pointing towards the user
-//    This conforms to the mobile device axes orientation as specified by the
-//    Android Sensor API.
-// 4. Data in the stream event is ordered as:
-//    data[0] = X-axis
-//    data[1] = Y-axis
-//    data[2] = Z-axis
-// 5. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 6. The Accelerometer Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 7. The Accelerometer Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and comp_matrix fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-// 8. When all outstanding requests to the Sensor are gated requests and if the
-//    "motion_detect" Sensor is enabled then the accel Sensor stops generating
-//    output events.
-//    a. When motion detect interrupt fires:
-//       - All existing accel gated stream requests are converted to non-gated
-//         stream requests.
-//         The accel Sensor publishes an event with message ID
-//         SNS_STD_EVENT_GATED_SENSOR_MSGID_GATED_REQ_CONVERTED_TO_NON_GATED to
-//         to indicate this change to it's gated clients.
-//       - The accel Sensor resumes generating output to all clients.
-//       So in effect motion_detect Sensor and accel gated Sensor stream have
-//       a one shot behavior.
-//    b. The Sensor resumes generating output events if motion detect interrupt
-//       is disabled potentially due to a new non-gated accel stream request or
-//       the request to motion_detect Sensor is disabled.
-// 9. When all outstanding requests to the Sensor are gated requests but if
-//    "motion_detect" Sensor is not enabled then the Sensor continues to generate
-//    output events.
-
-// Handling self-test requests:
-// 1. The Accelerometer Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Accelerometer Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Accelerometer Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Accelerometer Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_accel_cal.proto b/proprietary/vendor/etc/sensors/proto/sns_accel_cal.proto
deleted file mode 100644
index 4f7b806..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_accel_cal.proto
+++ /dev/null
@@ -1,32 +0,0 @@
-// @file sns_accel_cal.proto
-//
-// Defines message types for the Accel Calibration Sensor.
-//
-// Copyright (c) 2017, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_cal.proto";
-
-// The Accel Calibration Sensor determines the calibration parameters
-// for accel sensor
-
-// Accel Calibration Sensor Attributes:
-// - SNS_STD_SENSOR_ATTRID_TYPE: "accel_cal"
-// - SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG message ID is used to
-//      enable the sensor
-// - SNS_CAL_MSGID_SNS_CAL_RESET message ID is used to reset the algorithm
-//      and any previously determined calibration parameters.
-
-// Stream Events:
-// - SNS_CAL_MSGID_SNS_CAL_EVENT message ID is used to report calibration
-//      parameters to the client of the sensor. The sns_cal_event message as
-//      defined in sns_cal.proto is used to report this data event where the
-//      units for the bias field in the message are in m / s ^2
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_activity_recognition.proto b/proprietary/vendor/etc/sensors/proto/sns_activity_recognition.proto
deleted file mode 100644
index 63e1a02..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_activity_recognition.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// @file sns_activity_recognition.proto
-//
-// Defines message types for the Activity Recognition (AR) Sensor.
-//
-// Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// Acitivity Recognition Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "activity_recognition"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Acitivity Recognition Sensor
-enum sns_activity_recognition_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // The sns_ar_event message is used to publish updated state.  A new event
-  // will be generated upon any state change.
-  SNS_ACTIVITY_RECOGNITION_MSGID_SNS_AR_EVENT = 800;
-  // Configuration event generated at least once in response to enable request
-  SNS_ACTIVITY_RECOGNITION_MSGID_SNS_AR_CONFIG_EVENT = 801;
-}
-
-// User activity states
-enum sns_ar_motion_state
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // UNKNOWN is reported when the algorithm is unable to detect the current
-  // activity state.
-  SNS_AR_UNKNOWN = 0;
-  // User is relatively stationary.
-  SNS_AR_STATIONARY = 1;
-  // User is classified as a pedestrian
-  SNS_AR_PED = 2;
-  // User is in a non-motorized vehicle
-  SNS_AR_NMV = 3;
-  // User is in a motorized vehicle.
-  SNS_AR_MV = 4;
-  // User is walking
-  SNS_AR_WALK = 5;
-  // User is running
-  SNS_AR_RUN = 6;
-  // User is on a bicycle
-  SNS_AR_BICYCLE = 7;
-  // User is in a car
-  SNS_AR_CAR = 8;
-}
-
-message sns_ar_config_event
-{
-  // List of supported motion states
-  repeated sns_ar_motion_state states = 1;
-}
-
-message sns_ar_event
-{
-  // List of active states for this user
-  // Multiple states may be reported concurrently
-  // Any states not listed here are presumed to be inactive
-  repeated sns_ar_motion_state states = 1 [(nanopb).max_count = 4];
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ambient_light.proto b/proprietary/vendor/etc/sensors/proto/sns_ambient_light.proto
deleted file mode 100644
index 09cceff..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ambient_light.proto
+++ /dev/null
@@ -1,73 +0,0 @@
-// @file sns_ambient_light.proto
-//
-// Defines the API for Ambient Light Sensors.
-// All Ambient Light Sensor drivers are required to comply with this API.
-// Any new functionality for Ambient Light Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Ambient Light Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "ambient_light".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in Lux/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in Lux unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Ambient Light Sensor supports both streaming and on-change
-//    modes and the operating mode is configured in the Registry.
-// 2. The streaming Ambient Light Sensor handles the sns_std_sensor_config
-//    request for all stream enable/update requests.
-// 3. The on-change Ambient Light Sensor handles the
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG request for
-//    all stream enable/update requests.
-// 4. In on-change mode the Sensor uses interrupt operation and reports
-//    samples for only significant change in ambient light.
-//    Example: +/- 10% change.
-
-// Handling stream events:
-// 1. The Ambient Light Sensor publishes current illumination data stream
-//    events using the sns_std_sensor_event message.
-// 2. Each stream event contains two output data fields where data is
-//    factory calibrated and ordered as:
-//    data[0] = ambient light in Lux
-//    data[1] = raw ADC value associated with data[0]
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Ambient Light Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Ambient Light Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new request.
-
-// Handling self-test requests:
-// 1. The Ambient Light Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Ambient Light Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for Ambient Light Sensor calibrates
-//    the sensor such that it's output Lux value is comparable to a standard
-//    Luxmeter output in any lighting condition.
-// 3. The Ambient Light Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Ambient Light Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ambient_temperature.proto b/proprietary/vendor/etc/sensors/proto/sns_ambient_temperature.proto
deleted file mode 100644
index 69726b9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ambient_temperature.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// @file sns_ambient_temperature.proto
-//
-// Defines the API for Ambient Temperature Sensors.
-// All Ambient Temperature Sensor drivers are required to comply with this API.
-// Any new functionality for Ambient Temperature Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Ambient Temperature Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "ambient_temperature".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in degrees Celsius/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in degrees Celsius unit.
-// 4. The ambient_temperature sensor is an on-change sensor.
-// 5. The SNS_STD_SENSOR_ATTRID_RATES attribute is not applicable
-//    since this is an on-change sensor.
-// 6. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Ambient Temperature Sensor handles the SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-//    message ID for all stream enable/update requests.
-// 2. If the physical sensor supports hardware FIFO then the Ambient Temperature
-//    Sensor uses batching_period item in sns_std_request as the requested
-//    batching rate to determine hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Ambient Temperature Sensor publishes data stream events using the
-//    sns_std_sensor_event message.
-// 2. Each stream event contains one output data field where data is
-//    factory calibrated and ordered as:
-//    data[0] = Ambient Temperature data in degrees Celsius
-// 3. Each stream event publishs an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Ambient Temperature Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Ambient Temperature Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The Ambient Temperature Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Ambient Temperature Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Ambient Temperature Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Ambient Temperature Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_amd.proto b/proprietary/vendor/etc/sensors/proto/sns_amd.proto
deleted file mode 100644
index 8583b82..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_amd.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// @file sns_amd.proto
-//
-// Defines message types for the Absolute Motion Detector (AMD) Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// AMD calculates motion and stationary states. AMD will initially start in an
-// unknown state, and later transition to motion or stationary.
-
-// AMD Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "amd"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for AMD Sensor
-enum sns_amd_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_AMD_MSGID_SNS_AMD_EVENT = 772;
-}
-
-enum sns_amd_event_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_AMD_EVENT_TYPE_UNKNOWN          = 0;
-  SNS_AMD_EVENT_TYPE_STATIONARY       = 1;
-  SNS_AMD_EVENT_TYPE_MOTION           = 2;
-}
-
-message sns_amd_event
-{
-  // AMD motion state
-  required sns_amd_event_type state = 1 [default = SNS_AMD_EVENT_TYPE_UNKNOWN];
-}
-
-// Stream events:
-//
-// The sns_amd_event message is used to publish updated state
-//
-// AMD does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_aont.proto b/proprietary/vendor/etc/sensors/proto/sns_aont.proto
deleted file mode 100644
index de4b136..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_aont.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-// @file sns_aont.proto
-//
-// Defines message types for the AONT(Always On Test) Sensor.
-//
-// Copyright (c) 2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Always On Test Sensor runs an Always On sensors usecase for stability test coverage
-
-// Always On Test Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "always_on_test"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Stream Events:
-enum sns_aont_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_AONT_MSGID_SNS_AONT_DATA = 1024;
-}
-
-// Data Message
-// Output data event generated by the aont sensor.
-message sns_aont_data
-{
-  // AONT output - Accel data along axis x,y,z in m/s2
-  repeated float aont = 1 [(nanopb).max_count = 3];
-}
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_basic_gestures.proto b/proprietary/vendor/etc/sensors/proto/sns_basic_gestures.proto
deleted file mode 100644
index dfec6ba..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_basic_gestures.proto
+++ /dev/null
@@ -1,101 +0,0 @@
-// @file sns_basic_gestures.proto
-//
-// Defines message types for the the basic_gestures sensor
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-
-// Basic Gestures algorithm provides the ability to detect a Push, Pull,
-// or Shake gesture.
-// Basic Gestures reports "Axis Unknown", when the direction of a shake cannot
-// be reliably determined.
-
-// Basic gestures Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "basic_gestures"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_BASIC_GESTURES_MSGID_SNS_BASIC_GESTURES_CONFIG is used to enable the sensor
-
-// Message IDs for Basic gestures Sensor
-enum sns_basic_gestures_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-  SNS_BASIC_GESTURES_MSGID_SNS_BASIC_GESTURES_CONFIG = 512;
-  SNS_BASIC_GESTURES_MSGID_SNS_BASIC_GESTURES_EVENT = 1024;
-}
-//To mask Basic gesture algorithm output states
-enum sns_basic_gestures_event_mask
-{
-  option (nanopb_enumopt).long_names = false;
-  // For masking push and pull states
-  SNS_BASIC_GESTURES_EVENT_MASK_PUSH_AND_PULL        = 1;
-  // For masking shake left and right states
-  SNS_BASIC_GESTURES_EVENT_MASK_SHAKE_LEFT_AND_RIGHT = 2;
-  // For masking shake top and bottom states
-  SNS_BASIC_GESTURES_EVENT_MASK_SHAKE_TOP_AND_BOTTOM = 4;
-  //For masking shake other state
-  SNS_BASIC_GESTURES_EVENT_MASK_SHAKE_OTHER          = 8;
-}
-// Device Basic gesture detected by Basic gestures sensor
-enum sns_basic_gestures_event_type
-{
-  option (nanopb_enumopt).long_names = false;
-  //Phone is pulled away from the user in a direction perpendicular to the screen
-  SNS_BASIC_GESTURES_EVENT_TYPE_PUSH          = 1;
-  //Phone is pulled toward the user in a direction perpendicular to the screen
-  SNS_BASIC_GESTURES_EVENT_TYPE_PULL          = 2;
-  //Phone is shaken toward the left
-  SNS_BASIC_GESTURES_EVENT_TYPE_SHAKE_LEFT    = 3;
-  //Phone is shaken toward the right
-  SNS_BASIC_GESTURES_EVENT_TYPE_SHAKE_RIGHT   = 4;
-  //Phone is shaken toward the top
-  SNS_BASIC_GESTURES_EVENT_TYPE_SHAKE_TOP     = 5;
-  //Phone is shaken toward the bottom
-  SNS_BASIC_GESTURES_EVENT_TYPE_SHAKE_BOTTOM  = 6;
-  //Phone is shaken, but phone shake direction cannot be clearly determined
-  SNS_BASIC_GESTURES_EVENT_TYPE_SHAKE_OTHER   = 7;
-}
-// Event Message
-// Output data event generated by the basic_gestures sensor.
-// Default values of optional fields added in registry
-message sns_basic_gestures_config
-{
-  //Sleep time in seconds
-  optional float sleep           = 1;
-  //Push threshold m/s/s(default = 1.5G),where G=9.81188
-  //min_push_threshold:1G, max_push_threshold:5G
-  optional float push_threshold  = 2;
-  //Pull threshold m/s/s (default = 1.5G)
-  //min_pull_threshold:1G, max_pull_threshold:5G
-  optional float pull_threshold  = 3;
-  //Shake threshold m/s/s(default = 1.5G)
-  //min_shake_threshold:1G, max_shake_threshold:5G
-  optional float shake_threshold = 4;
-  //For masking output events.
-  //By default, All states reported.
-  //Client should use sns_basic_gestures_event_mask fields for masking,
-  //specific events
-  //Example: If client doesn't want push and pull events,then,
-  //client updates event_mask with SNS_BASIC_GESTURES_EVENT_MASK_PUSH_AND_PULL
-  //event_mask |= SNS_BASIC_GESTURES_EVENT_MASK_PUSH_AND_PULL;
-  optional bytes event_mask    = 5;
-}
-
-// Event Message
-// Output data event generated by the basic_gestures sensor.
-message sns_basic_gestures_event
-{
- // basic_gestures sensor state info
- required sns_basic_gestures_event_type state=1;
-}
-
-// Stream events:
-//
-// The sns_basic_gestures_event message is used to publish updated state
-//
-// Basic_gestures sensor does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_bring_to_ear.proto b/proprietary/vendor/etc/sensors/proto/sns_bring_to_ear.proto
deleted file mode 100644
index c610a2b..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_bring_to_ear.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// @file sns_bring_to_ear.proto
-//
-// Defines message types for the the Bring_To_Ear sensor
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// Bring_to_ear sensor detects bring to ear event,
-// When a device has been held in a face-up position,
-// afterwhich the device is brought to the user's ear, with the top of the device facing upwards.
-
-// Bring to ear Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "bring_to_ear"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-
-// ## Event Message: SNS_BRING_TO_EAR_MSGID_SNS_BRING_TO_EAR_EVENT
-// Reported upon new detection of bring_to_ear event
-
-
-// Message IDs for Bring to ear Sensor
-enum sns_bring_to_ear_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-  // Empty Message
-  SNS_BRING_TO_EAR_MSGID_SNS_BRING_TO_EAR_EVENT = 1024;
-}
-
-// Stream events:
-//
-// The sns_bring_to_ear_event message is used to publish updated state
-//
-// Bring_to_ear sensor does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_cal.proto b/proprietary/vendor/etc/sensors/proto/sns_cal.proto
deleted file mode 100644
index fe878b0..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_cal.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-// @file sns_cal.proto
-//
-// Defines standard message types pertaining to calibration
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// For dynamic calibration supported by Calibration Sensors:
-// Client will use the standard on change config message id to enable 
-// Calibration Sensor. Calibration algorithms are inherently on change in
-// behavior.
-
-// For both dynamic calibration supported by Calibration Sensors &
-// factory calibration supported by Physical Sensors:
-// Client can send an empty request with the msg id for reset
-// to reset the calibration parameters.
-enum sns_cal_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-  SNS_CAL_MSGID_SNS_CAL_RESET =  512;
-  SNS_CAL_MSGID_SNS_CAL_EVENT = 1022;
-}
-
-// Calibration Event
-// Used as an output data event by Calibration Sensors to convey
-// dynamic calibration estimates and 
-// as a config event by Physical Sensors to convey factory calibration
-// being applied
-//
-// A) The data field of the sns_cal_event message
-// 
-// 1) float bias[] (Nx1 vector)
-//      The zero bias (B) correction subtracted to get calibrated sample.(Nx1 vector)
-//
-// 2) float scale_factor (Nx1 vector)
-//      The scaling (SF) to be done before doing any bias correction.
-//
-// 3) float comp_matrix (NxN matrix)
-//      The compensation matrix (CM). The matrix elements are in row major order ie:
-//      CM =  CM0  CM1  CM2
-//            CM3  CM4  CM5
-//            CM6  CM7  CM8
-//
-//      The calibrated sample (Sc) is computed as following.
-//
-//      if SF, B and CM are available,
-//
-//          Sc = CM * ((S .* SF) - B)
-//
-//      if only B and CM are available,
-//
-//          Sc = CM * (S - B)
-//
-//      if only SF and B are available,
-//
-//          Sc = ((S .* SF) - B)
-//
-//      if only SF is available,
-//
-//          Sc = S .* SF
-//
-//      if only B is available,
-//
-//          Sc = (S - B)
-//
-//      if only CM is available
-//
-//          Sc = CM * S
-//
-//      where:
-//          Sc = Calibrated sensor sample
-//          S = Sensor sample (Nx1 vector)
-//          SF = Scaling factor to be applied to S
-//          CM = compensation_matrix
-//          B = bias
-//          "*" represents matrix multiplication
-//          ".*" represents element-by-element multiplication
-//
-//
-// B) The status field of the sns_std_sensor_event message contains
-//    the quality of calibration defined by sns_std_sensor_sample_status as
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE = 0; // Sample is unreliable.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_LOW = 1; // Sample is low accuracy.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_MEDIUM = 2;// Sample is medium accuracy.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH = 3; // Sample is high accuracy.
-
-message sns_cal_event
-{
-  //Optional bias value
-  //If no bias is being published this will be of size 0.  
-  //Generic for different axes biases.
-  //Size is defined by axes value inherently.
-  repeated float bias = 1;
-  
-  //Optional scaling factor
-  //If no scaling factor is published this will be of size 0.
-  //Size if published is has to be equal to the axes of the data
-  repeated float scale_factor = 2;
- 
-  //If no CM is being published this will be of size 0.
-  //Optional CM values . 
-  //Size if published should be equal to matrix of size [axes*axes] 
-  repeated float comp_matrix = 3;
-  
-  // Event sample status.
-  required sns_std_sensor_sample_status status = 4 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-
-  // Calibration ID, a unique identifier for the calibration set being used
-  // As an example, could be set when there are distinct calibration sets for different
-  // device modes being maintained
-  optional fixed32 cal_id = 5;
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_cct.proto b/proprietary/vendor/etc/sensors/proto/sns_cct.proto
deleted file mode 100644
index b8d6f91..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_cct.proto
+++ /dev/null
@@ -1,94 +0,0 @@
-// @file sns_flicker.proto
-//
-// Defines the API for Proximity Sensors.
-// All Proximity Sensor drivers are required to comply with this API.
-// Any new functionality for Proximity Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-//import "sns_std_sensor.proto";
-//import "sns_physical_sensor_test.proto";
-//import "sns_cal.proto";
-
-// Attribute requirements:
-// The Proximity Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "cct".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute is not applicable since this
-//    is an event sensor.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in k unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Proximity Sensor supports both streaming and on-change
-//    modes and the operating mode is configured in the Registry.
-// 2. The streaming Proximity Sensor handles the sns_std_sensor_config request
-//    for all stream enable/update requests.
-// 3. The on-change Proximity Sensor handles the
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG request for
-//    all stream enable/update requests.
-// 4. In on-change mode the Sensor uses interrupt operation and reports
-//    samples only for NEAR/FAR transitions.
-
-
-// Message IDs for cct Sensor
-enum sns_cct_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_cct_event
-  // Purpose: An output data event from the cct sensor to it's client.
-  SNS_CCT_MSGID_SNS_CCT_EVENT  = 882;
-}
-
-
-// Events types from cct Sensor
-message sns_cct_event
-{
-  required float cct = 1;
-  required int32 red_raw = 2;
-  required int32 green_raw = 3;
-  required int32 blue_raw = 4;
-  required int32 clear_raw = 5;
-  required int32 wband_raw = 6;
-  required float ir_ratio = 7;
-  required float x = 8;
-  required float y = 9;
-  required float lux = 10;
-  required float als_gain = 11;
-  required float a_time = 12;
-}
-
-// Handling stream events:
-// 1. The Proximity Sensor publishes object flicker data stream events
-//    using sns_flicker_event message.
-// 2. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 3. The Proximity Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
-// Handling self-test requests:
-// 1. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for Proximity Sensor calibrates
-//    the sensor to detect an object (including light and dark colored)
-//    at 5cm distance from the physical sensor.
-// 3. The Proximity Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Proximity Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_client.proto b/proprietary/vendor/etc/sensors/proto/sns_client.proto
deleted file mode 100644
index 22497eb..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_client.proto
+++ /dev/null
@@ -1,116 +0,0 @@
-// @file sns_client.proto
-//
-// Defines the interface between external clients and the Sensors QMI Client
-// Manager.  The Client Manager is the primary path for external clients
-// to communicate with the SSC.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std.proto";
-import "sns_std_type.proto";
-
-// Message IDs
-//
-// Message IDs uniquely identify a particular message amongst all message
-// supported by a Sensor, both requests and events; they need not be unique
-// between different Sensors.  IDs are subdivided into several reserved pools.
-// These reservations are made so that Framework components can appropriately
-// optimize their processing.
-//
-// Reserved for Framework use only:
-// 0-127   - Request Messages
-// 128-255 - Non-recurrent events (configuration updates, one-time events, etc)
-// 256-511 - Recurrent and/or periodic events (e.g. sensor samples)
-//
-// Sensor use:
-// 512-767  - Request messages
-// 768-1023 - Non-recurrent events
-// 1024-1536 - Recurrent events
-//
-// Note that messages serving as request messages can also be sent as
-// configuration events back to the client (with the same ID).  While batching
-// data for a non-wakeup client, if the AP is in suspend and all batching space
-// exhausted, the oldest recurrent events may be dropped.
-
-// Framework-defined message IDs:
-enum sns_client_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Disable request explicitly handled only on the client interface.
-  SNS_CLIENT_MSGID_SNS_CLIENT_DISABLE_REQ = 10;
-
-  // NOTE: 120-127 Are reserved
-}
-
-enum sns_client_delivery {
-  option (nanopb_enumopt).long_names = false;
-
-  // Send events whenever available (at sample rate or batch period)
-  // - If a batch_period larger than system capacity is requested, all data
-  //   will be sent upon capacity exhaustion.
-  // - The flush_period will be effectively ignored, as unsent batched
-  //   data will not accrue in the buffer.
-  SNS_CLIENT_DELIVERY_WAKEUP = 0;
-  // Send events only when client processor is awake; batch otherwise.  Once
-  // the target processor exits suspend, any/all pending events will be sent.
-  SNS_CLIENT_DELIVERY_NO_WAKEUP = 1;
-}
-
-
-// Request Message
-message sns_client_request_msg {
-  // SUID associated with this request; intended destination
-  required sns_std_suid suid = 1;
-
-  // See comment above
-  required fixed32 msg_id = 2;
-
-  // Whether to wakeup the client processor (if it is in suspend), when an
-  // event is generated and ready to send.  The Qualcomm Client Manager will
-  // enforce these criteria for all clients; this information is made available
-  // to sensors for optimization purposes only.
-  message suspend_config {
-    // Processor on which the client resides; If a flush occurs for one client
-    // on an external processor, all clients will receive a flush of data.
-    required sns_std_client_processor client_proc_type = 1 [default = SNS_STD_CLIENT_PROCESSOR_APSS];
-
-    // Whether to send events while the specified processor is in suspend.
-    required sns_client_delivery  delivery_type = 2 [default = SNS_CLIENT_DELIVERY_WAKEUP];
-
-    //The client expects that, when the message with an id specified in this list 
-    //is generated, the message should only be delivered to the client if data is already being delivered
-    //to the processor mentioned above.
-    repeated fixed32 nowakeup_msg_ids = 3;
-  }
-  required suspend_config susp_config = 3;
-
-  // Base message payload; contents will be partially specified by Sensor developer
-  required sns_std_request request = 4;
-}
-
-message sns_client_event_msg {
-  // SUID associated with this Event; source of data
-  required sns_std_suid suid = 1;
-
-  // An event generated by a Sensor; used within sns_client_event_msg and SensorBatchMessage
-  message sns_client_event {
-    // See comment above
-    required fixed32 msg_id = 1;
-
-    // Timestamp associated with this event
-    // For most events, this timestamp is specified by the Sensor.
-    // For events generated by the Framework (such as configuration updates or
-    // error events), this timestamp refers to the time at which the event was
-    // created.
-    required fixed64 timestamp = 2;
-
-    // Dynamic length payload, containing the actual data/event
-    // This payload will need to be decoded separately, using the Sensor-specific
-    // header file
-    required bytes payload = 3;
-  }
-  repeated sns_client_event events = 2;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_cmc.proto b/proprietary/vendor/etc/sensors/proto/sns_cmc.proto
deleted file mode 100644
index 122da06..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_cmc.proto
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// @file sns_cmc.proto
-//
-// Defines message types for the Coarse Motion Classifier (CMC) Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-
-// CMC Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "coarse_motion_classifier"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for CMC Sensor
-enum sns_cmc_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_CMC_MSGID_SNS_CMC_EVENT = 772;
-}
-
-// Gives the state which the algorithm is capable
-// of detecting
-enum sns_cmc_motion_state
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // stated with 1 to match with algo where 0
-  // is for UNKNOWN
-  SNS_CMC_STATIONARY  = 1;
-  SNS_CMC_MOVE        = 2;
-  SNS_CMC_FIDDLE      = 3;
-  SNS_CMC_PEDESTRIAN  = 4;
-  SNS_CMC_VEHICLE     = 5;
-  SNS_CMC_WALK        = 6;
-  SNS_CMC_RUN         = 7;
-  SNS_CMC_BIKE        = 8;
-}
-
-// Gives the information about the states represented
-// by sns_cmc_motion_state
-enum sns_cmc_motion_state_event
-{
-  option (nanopb_enumopt).long_names = false;
-  // when any state of any of the motion state cannot
-  // be determined. The first event of first client will
-  // typically have all states as SNS_MS_UNKNOWN
-  SNS_MS_UNKNOWN  = 0;
-  // A given motion state is ACTIVE
-  SNS_MS_ACTIVE   = 1;
-  // A given motion state is INACTIVE
-  SNS_MS_INACTIVE = 2;
-}
-
-message sns_cmc_event
-{
-  message data
-  {
-     // motion state by CMC
-     required sns_cmc_motion_state ms_state = 1;
-
-     // gives UNKNOWN/ACTIVE/INACTIVE information for the motion state
-     required sns_cmc_motion_state_event ms_state_event = 2  [default = SNS_MS_UNKNOWN];
-  }
-
-  repeated data events = 1;
-}
-
-// Stream events:
-//
-// The sns_cmc_event message is used to publish updated state
-//
-// CMC does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_da_test.proto b/proprietary/vendor/etc/sensors/proto/sns_da_test.proto
deleted file mode 100644
index b72a610..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_da_test.proto
+++ /dev/null
@@ -1,65 +0,0 @@
-// @file sns_da_test.proto
-//
-// Defines the API for communicating with the Driver acceptance
-// test sensor.
-// This is to used by the linux command line partner application
-// to send string messages to the sns_da_test_sensor
-//
-// Copyright (c) 2017, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-
-enum sns_da_test_msgid {
-  option (nanopb_enumopt).long_names = false;
-  SNS_DA_TEST_MSGID_SNS_DA_TEST_REQ = 512;
-  SNS_DA_TEST_MSGID_SNS_DA_TEST_LOG = 768;
-  SNS_DA_TEST_MSGID_SNS_DA_TEST_EVENT  = 1024;
-}
-
-//This message contains the test parameters as a single string in the format below
-//-testcase=<not_mandatory> -sample_rate=< any +tive value > -sensor=<data_type>
-//-duration=< any +tive value in seconds> -batch_period=<+tive value in seconds>
-message sns_da_test_req {
-  optional string test_args = 1;
-}
-
-//This message contains any return data from the test driver including PASS/FAIL
-//msg. and explainations if applicable
-message sns_da_test_event {
-  optional string test_event = 1;
-}
-
-// Sensor State log message
-// This definition is used by da_test sensor to log test
-// information when publishing sensor api event
-message sns_da_test_log {
-  //Time elapsed between streaming start request time and first sample received
-  required uint64 time_to_first_event = 1;
-
-  //Time elapsed between streaming stop request time and last sample received
-  required sfixed32 time_to_last_event = 2;
-
-  //Time when last sample was received
-  required uint64 sample_ts = 3;
-
-  //Total number of samples received
-  required uint32 total_samples = 4;
-
-  //time delta between samples avegraged over number of samples
-  required uint32 avg_delta = 5;
-
-  //configures sample rate received in the SNS_STD_SENSOR_PHYSICAL_CONFIG_EVENT
-  required sfixed32 recvd_phy_config_sample_rate = 6;
-
-  //random seed used by the da_test instance
-  optional uint64 random_seed_used = 7;
-
-  //The number of std_req sent out by this instance of da_test
-  optional uint32 num_request_sent = 8;
-
-  //timestamp of first sample received on da_test
-  optional uint64 first_sample_timestamp = 9;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_device_mode.proto b/proprietary/vendor/etc/sensors/proto/sns_device_mode.proto
deleted file mode 100644
index 66b5efd..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_device_mode.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-// @file sns_device_mode.proto
-//
-// Defines message types for the Device Mode Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// DEVICE_MODE determine the current mode of the device
-
-// DEVICE_MODE Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "device_mode"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-// - Client must remove stream to disable the sensor
-
-// Message IDs for DEVICE_MODE Sensor
-enum sns_device_mode_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_DEVICE_MODE_MSGID_SNS_DEVICE_MODE_EVENT = 772;
-}
-
-enum sns_device_mode
-{
-  option (nanopb_enumopt).long_names = false;
-  SNS_DEVICE_MODE_UNKNOWN = 0;
-  SNS_DEVICE_MODE_FLIP_OPEN  = 1;
-}
-
-enum sns_device_state
-{
-  option (nanopb_enumopt).long_names = false;
-  SNS_DEVICE_STATE_INACTIVE  = 0;
-  SNS_DEVICE_STATE_ACTIVE  = 1;
-}
-
-message sns_device_mode_event
-{
-  message mode_spec {
-    required sns_device_mode mode = 1;
-
-    required sns_device_state state = 2;
-  }
-  // Device Mode
-  repeated mode_spec device_mode = 1;
-}
-
-// Stream events:
-//
-// The sns_device_mode_event message is used to publish updated mode
-//
-// DEVICE_MODE does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_device_orient.proto b/proprietary/vendor/etc/sensors/proto/sns_device_orient.proto
deleted file mode 100644
index d57f922..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_device_orient.proto
+++ /dev/null
@@ -1,57 +0,0 @@
-// @file sns_device_orient.proto
-//
-// Defines the API for the Device Orientation sensors
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// A device orientation sensor reports the current orientation of the device.
-//
-// Minor or transient rotations should not cause a new event to be reported,
-// and this sensor should only be implemented with the help of an accelerometer.
-// Moving the device to an orientation where the Z axis is vertical (either up
-// or down) should not cause a new event to be reported.
-
-// ## Device Orientation sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "device_orient"
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-//
-// ## Event Message: SNS_DEVICE_ORIENT_MSGID_SNS_DEVICE_ORIENT_EVENT
-
-// Message IDs for Device Orientation Sensor
-enum sns_device_orient_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_DEVICE_ORIENT_MSGID_SNS_DEVICE_ORIENT_EVENT = 776;
-}
-
-enum sns_device_orient_event_type
-{
-  option (nanopb_enumopt).long_names = false;
-  
-  SNS_DEVICE_ORIENT_EVENT_TYPE_UNKNOWN     = -1;
-  // Device is in default orientation (Y axis is vertical and points up)
-  SNS_DEVICE_ORIENT_EVENT_TYPE_DEFAULT     = 0;
-  // Device is rotated 90 degrees counter-clockwise from default orientation
-  // (X axis is vertical and points up)
-  SNS_DEVICE_ORIENT_EVENT_TYPE_POS_1      = 1;
-  // Device is rotated 180 degrees from default orientation (Y axis is
-  // vertical and points down)
-  SNS_DEVICE_ORIENT_EVENT_TYPE_POS_2      = 2;
-  // Device is rotated 90 degrees clockwise from default orientation (X axis
-  // is vertical and points down)
-  SNS_DEVICE_ORIENT_EVENT_TYPE_POS_3      = 3;
-}
-
-message sns_device_orient_event
-{
-  // Detected state
-  required sns_device_orient_event_type state = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_diag.proto b/proprietary/vendor/etc/sensors/proto/sns_diag.proto
deleted file mode 100644
index 0b02cbb..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_diag.proto
+++ /dev/null
@@ -1,433 +0,0 @@
-// @file sns_diag.proto
-//
-// Defines log messages used by the sensors diag service
-//
-// Copyright (c) 2016-2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std.proto";
-import "sns_std_sensor.proto";
-import "sns_client.proto";
-
-// Batch Sample Type
-enum sns_diag_batch_sample_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // This is the only sample in the batch
-  SNS_DIAG_BATCH_SAMPLE_TYPE_ONLY = 0;
-
-  // This is the first sample of the batch
-  SNS_DIAG_BATCH_SAMPLE_TYPE_FIRST = 1;
-
-  // This is an intermediate sample of the batch
-  SNS_DIAG_BATCH_SAMPLE_TYPE_INTERMEDIATE = 2;
-
-  // This is the last sample of the batch
-  SNS_DIAG_BATCH_SAMPLE_TYPE_LAST = 3;
-}
-
-// Sensor Interrupts
-enum sns_diag_interrupt
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Interrupt caused by detection of a threshold being
-  // exceeded
-  SNS_DIAG_INTERRUPT_THRESHOLD = 0;
-
-  // Interrupt caused by detection of movement of the device
-  SNS_DIAG_INTERRUPT_MOTION    = 1;
-
-  // Interrupt caused by detection of tilting of the device
-  SNS_DIAG_INTERRUPT_TILT      = 2;
-
-  // Interrupt caused by detection of free fall
-  SNS_DIAG_INTERRUPT_FREE_FALL = 3;
-
-  // Interrupt caused by detection of double-tap
-  SNS_DIAG_INTERRUPT_DOUBLE_TAP= 4;
-
-  // Interrupt caused by detection of acceleration shock
-  SNS_DIAG_INTERRUPT_SHOCK     = 5;
-
-  // Interrupt caused by CCD AMD
-  SNS_DIAG_INTERRUPT_CCD_AMD   = 6;
-
-  // Interrupt caused by CCD WALK
-  SNS_DIAG_INTERRUPT_CCD_WALK  = 7;
-
-  // Interrupt caused by CCD TILT
-  SNS_DIAG_INTERRUPT_CCD_TILT  = 8;
-
-  // Interrupt caused by CCD TE0
-  SNS_DIAG_INTERRUPT_CCD_TE0   = 9;
-
-  // Interrupt caused by CCD TE1
-  SNS_DIAG_INTERRUPT_CCD_TE1   = 10;
-
-  // Interrupt caused by CCD TE2
-  SNS_DIAG_INTERRUPT_CCD_TE2   = 11;
-}
-
-// Opaque Payload
-// This message defines the fields used to log an undefined payload
-message sns_diag_opaque_payload
-{
-  required bytes payload = 1;
-}
-
-// Batch Sample
-// This message defines the fields used to log batched data.
-message sns_diag_batch_sample
-{
-  // Indicates if the sample is the first, intermediate, last or only
-  // sample of a batch
-  required sns_diag_batch_sample_type sample_type = 1 [default = SNS_DIAG_BATCH_SAMPLE_TYPE_ONLY];
-
-  // Timestamp of the sensor state data sample
-  required fixed64 timestamp = 2;
-
-  // Sensor state data sample
-  repeated float sample = 3;
-
-  // Data status.
-  required sns_std_sensor_sample_status status = 4 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-// Sensor State Hardware Interrupt Log Packet
-// This message defines the fields used to log sensor state information
-// pertaining to hardware interrupts
-// This message is used as the payload field of sns_diag_sensor_log
-message sns_diag_sensor_state_interrupt
-{
-  // Type of sensor hardware interrupt
-  required sns_diag_interrupt interrupt = 1;
-
-  // Timestamp when the interrupt occurred
-  required fixed64 timestamp = 2;
-}
-
-// Sensor State Raw
-// This message defines the fields used to log sensor state information
-// pertaining to raw uncalibrated physical sensor data.
-// This message is used as the payload field of sns_diag_sensor_log
-message sns_diag_sensor_state_raw
-{
-  repeated sns_diag_batch_sample sample = 1;
-}
-
-// Client API Response Message
-message sns_diag_client_resp_msg
-{
-  // The error response sent to the client
-  required sns_std_error error = 1;
-}
-
-// Client API log packet
-// This message defines the fields to log all
-// Request, Response and Event messages at the Client API
-// This message is used as the payload field of sns_diag_sensor_log
-message sns_diag_client_api_log
-{
-  // The client id that identifies the client connection
-  required fixed64 client_id = 1;
-
-  // Data type of the source sensor
-  required string src_sensor_type = 2;
-
-  // The Client API log packet payload
-  oneof client_api_log_payload
-  {
-    // Client API Request message as defined in sns_client.proto
-    sns_client_request_msg request_payload = 100;
-
-    // Client API Event message as defined in sns_client.proto
-    sns_client_event_msg event_payload = 101;
-
-    // Client API Response message as defined in sns_diag.proto
-    sns_diag_client_resp_msg resp_payload = 102;
-  }
-}
-
-// Sensor API log packet
-// This message defines the fields to log all Request and
-// Event messages at the Sensor API
-// This message is used as the payload field of sns_diag_sensor_log
-message sns_diag_sensor_api_log
-{
-  // The message id of the message being logged
-  required fixed32 message_id = 1;
-
-  // Timestamp associated with this message
-  required fixed64 timestamp = 2;
-
-  // Data stream associated with this message
-  optional fixed64 stream_id = 3;
-
-  // The Sensor API log packet payload
-  oneof sensor_api_log_payload
-  {
-    // Sensor API Event message containing sensor specific event message
-    // as defined in the sensor's proto api file
-    sns_diag_opaque_payload opaque_payload = 100;
-
-    // Sensor API Request message as defined in sns_std.proto
-    sns_std_request request_payload = 101;
-  }
-}
-
-// Sensor log packet
-// This message defines the fields to log all sensor specific
-// messages. This includes Sensor API messages, Client API messages,
-// HW Interrupt messages, Sensor State messages
-message sns_diag_sensor_log
-{
-  // Log ID for the log packet
-  required fixed32 log_id = 1;
-
-  // Timestamp when log packet.was generated
-  required fixed64 timestamp = 2;
-
-  // Sensor UID for the log packet
-  required sns_std_suid suid = 3;
-
-  // Data type provided by the Sensor UID
-  required string sensor_type = 4;
-
-  // The instance id of the sensor to which this
-  // message was passed to or obtained from
-  required fixed64 instance_id = 5;
-
-  // The log packet payload
-  oneof sensor_log_payload
-  {
-    // Sensor specific Sensor State Algo message
-    sns_diag_opaque_payload opaque_payload = 100;
-
-    // Sensor API message
-    sns_diag_sensor_api_log sensor_api_payload = 101;
-
-    // Client API message
-    sns_diag_client_api_log client_api_payload = 102;
-
-    // Sensor State Raw message
-    sns_diag_sensor_state_raw sensor_state_raw_payload = 103;
-
-    // Sensor State Hardware Interrupt message
-    sns_diag_sensor_state_interrupt sensor_state_interrupt_payload = 104;
-  }
-}
-
-// Sensor Instance Mapping Log Packet
-// This message defines the fields used to log sensor instance mapping
-// information.  This message is used as the payload field of sns_diag_fw_log
-message sns_diag_instance_map_log
-{
-  // The instance id of the source sensor instance
-  required fixed64 src_instance_id = 1;
-
-  // Array of destination Sensor Instance IDs or Sensor IDs that the
-  // source sensor instance is feeding to.
-  // If no destination instance ids are specified it signifies
-  // deletion of the source instance
-  repeated fixed64 dest_instance_id = 2;
-
-  // Array of data stream ids that the
-  // source sensor instance is feeding to
-  repeated fixed64 stream_id = 3;
-}
-
-// Island mode states
-enum sns_diag_island_state
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // In Island mode
-  SNS_DIAG_ISLAND_STATE_IN_ISLAND_MODE = 0;
-
-  // Not in Island Mode
-  SNS_DIAG_ISLAND_STATE_NOT_IN_ISLAND_MODE = 1;
-
-  // Island mode disabled
-  SNS_DIAG_ISLAND_STATE_ISLAND_DISABLED = 2;
-}
-
-// Island mode transition Log Packet
-// This message defines the fields used to log
-// transitions into and out of island mode
-//
-// This log packet is generated each time the system transitions into or out
-// of island mode or when island mode is disabled or when triggered by
-// a request to the diag sensor
-//
-// This message is used as the payload field of sns_diag_fw_log
-message sns_diag_island_transition_log
-{
-  // Timestamp of the transition
-  //
-  // When logpacket is triggered, this timestamp will retain
-  // the timestamp when the current state became effective.
-  required fixed64 timestamp = 1;
-
-  // Island state after transition is completed
-  required sns_diag_island_state island_state = 2;
-
-  // User defined cookie
-  // Used by test scripts to identify logs triggered
-  // by messages sent to the SSC
-  optional fixed64 cookie = 3;
-
-  // Total time system spent in island since device boot(micro seconds)
-  optional fixed64 total_island_time = 4;
-}
-
-// Island exit vote Log Packet
-// This message defines the fields used to log vote for island mode exits.
-//
-// This log packet is generated at each call to island_exit()
-message sns_diag_island_exit_vote_log
-{
-  // Timestamp
-  required fixed64 timestamp = 1;
-
-  // SUID of the Sensor responsible for the vote
-  optional sns_std_suid sensor = 2;
-}
-
-// Heap IDs
-enum sns_diag_heap_id
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Primary Heap
-  SNS_DIAG_HEAP_ID_HEAP_MAIN = 0;
-
-  // Island Heap
-  SNS_DIAG_HEAP_ID_HEAP_ISLAND = 1;
-
-  // PRAM Heap
-  SNS_DIAG_HEAP_ID_HEAP_PRAM = 2;
-
-  // EVENT Heap
-  SNS_DIAG_HEAP_ID_HEAP_EVENT = 3;
-
-  // BATCH Heap
-  SNS_DIAG_HEAP_ID_HEAP_BATCH = 4;
-
-  // Event buffer
-  SNS_DIAG_HEAP_ID_EVENT_BUFFER = 100;
-}
-
-// Memory status Log Packet
-// This message defines the fields used to log the memory utilization
-// This log packet is generated when a request is sent to the diag sensor
-message sns_diag_mem_utilization_log
-{
-  // Timestamp
-  required fixed64 timestamp = 1;
-
-  // Heap ID
-  required sns_diag_heap_id heap_id = 2;
-
-  // Total Memory
-  required fixed32 total_memory = 3;
-
-  // Used Memory
-  required fixed32 used_memory = 4;
-
-  // User defined cookie
-  // Used by test scripts to identify logs triggered
-  // by messages sent to the SSC
-  optional fixed64 cookie = 5;
-}
-
-// Event Service status Log Packet
-// This message defines the fields used to log the memory utilization and
-// other statistics from the Event Service.
-// Used only for SW debug; *not guaranteed to be backward compatible*
-// This log packet is generated when a request is sent to the diag sensor
-message sns_diag_event_service_log
-{
-  // Timestamp
-  required fixed64 timestamp = 1;
-
-  // User defined cookie
-  // Used by test scripts to identify logs triggered
-  // by messages sent to the SSC
-  optional fixed64 cookie = 2;
-
-  message heap_stats
-  {
-    enum sns_event_service_heap_id
-    {
-      SNS_EVENT_SERVICE_HEAP_ID_ISLAND = 0;
-      SNS_EVENT_SERVICE_HEAP_ID_MAIN = 1;
-    }
-    // Heap ID
-    required sns_event_service_heap_id heap_id = 1;
-
-    // Total memory available in heap (in blocks)
-    required fixed32 total_memory = 2;
-
-    // Current memory consumption (in blocks)
-    required fixed32 used_memory = 3;
-
-    // Maximum memory consumption since last log packet (in blocks)
-    required fixed32 max_memory = 4;
-
-    // Total clusters available
-    required fixed32 total_clusters = 5;
-
-    // Current number of clusters in use
-    required fixed32 used_clusters = 6;
-
-    // Maximum in-use clusters since last log packet
-    required fixed32 max_clusters = 7;
-
-    // Number of allocation failues since the last DIAG log packet
-    // If Island will result in island exit; else causes dropped samples
-    required fixed32 alloc_failures = 8;
-
-    // Largest event allocation since the last DIAG log packet (in bytes)
-    required fixed32 max_size = 9;
-  }
-  repeated heap_stats stats = 3;
-}
-
-// Framework log packet
-// This message defines the fields to log all framework messages. This
-// includes memory, island, instance mapping messages.
-message sns_diag_fw_log
-{
-  // Log ID for the log packet
-  required fixed32 log_id = 1;
-
-  // Timestamp when log packet.was generated
-  required fixed64 timestamp = 2;
-
-  // The log packet payload
-  oneof fw_log_payload
-  {
-    // Sensor Instance Map message
-    sns_diag_instance_map_log instance_map_payload = 100;
-
-    // Sensor Island Mode
-    sns_diag_island_transition_log island_mode_payload = 101;
-
-    // Sensors Island Exit vote
-    // NOT SUPPORTED YET.
-    sns_diag_island_exit_vote_log island_exit_vote_payload = 102;
-
-    // Sensors Memory Utilization
-    sns_diag_mem_utilization_log memory_utilization_payload = 103;
-
-    // Event Service status log
-    sns_diag_event_service_log event_service_payload = 104;
-  }
-}
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_diag_sensor.proto b/proprietary/vendor/etc/sensors/proto/sns_diag_sensor.proto
deleted file mode 100644
index 804e7e6..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_diag_sensor.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// @file sns_diag_sensor.proto
-//
-// Defines standard message types to communicate with the
-// diag service
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_type.proto";
-
-enum sns_diag_sensor_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_DIAG_SENSOR_MSGID_SNS_DIAG_LOG_TRIGGER_REQ = 520;
-}
-
-// Log packets that can be triggered by the diag sensor
-enum sns_diag_triggered_log_type {
-  option (nanopb_enumopt).long_names = false;
-
-  // Triggers generation of sns_diag_island_transition_log
-  // Only one log is generated per request
-  SNS_DIAG_TRIGGERED_LOG_TYPE_ISLAND_LOG = 1;
-
-  // Triggers generation of sns_diag_mem_utilization_log
-  // A single request will generate a log for each separate memory
-  // pool in the system
-  SNS_DIAG_TRIGGERED_LOG_TYPE_MEMORY_USAGE_LOG = 2;
-}
-
-// Trigger generation of log packets. Depending upon
-// the type of log packet that is being triggered,
-// multiple log packets can be triggered for each
-// request.
-//
-// If the log packet that is triggered has been disabled
-// no log will be generated.
-message sns_diag_log_trigger_req {
-
-  // User defined cookie
-  // Used by test scripts to identify logs triggered
-  // by messages sent to the SSC
-  optional fixed64 cookie = 1;
-
-  // The type of log packets that the diag sensor must
-  // generate.
-  required sns_diag_triggered_log_type log_type = 2;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_direct_channel.proto b/proprietary/vendor/etc/sensors/proto/sns_direct_channel.proto
deleted file mode 100644
index 5601bb3..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_direct_channel.proto
+++ /dev/null
@@ -1,124 +0,0 @@
-// @file sns_direct_channel.proto
-//
-// Defines the Sensors Direct Channel interface that can be used by clients to get sensor data via direct channel
-//
-// Copyright (c) 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_type.proto";
-import "sns_std.proto";
-
-// To activate a stream on a channel
-// " get Channel first by sending sns_direct_channel_create_msg -> then send sns_direct_channel_set_ts_offset  -> send sns_direct_channel_set_client_req for sns_direct_channel_stream_id"
-
-// To activate another stream on existing channel
-// "Send sns_direct_channel_set_client_req on existing Channel for new sns_direct_channel_stream_id"
-
-// To update the existing request on the channel
-// "Send updated sns_direct_channel_set_client_req on existing Channel with already added sns_direct_channel_stream_id"
-
-// To remove existing request on the channel
-// "Send sns_direct_channel_remove_client_req on existing Channel for any added sns_direct_channel_stream_id"
-
-// To update time stamp offset on channel.
-// "Send sns_direct_channel_set_ts_offset on existing Channel with ts_offset"
-
-
-enum direct_channel_type {
-   option (nanopb_enumopt).long_names = false;
-
-  // Sensor data from multiple streams can be multiplexed in one channel
-  // Samples are compatible to sensors_event_t format defined by Android Spec
-  // ref: SensorsEventFormatOffset( a.k.a sensors_event_t) at hardware/interfaces/sensors/1.0/types.hal
-   DIRECT_CHANNEL_TYPE_STRUCTURED_MUX_CHANNEL = 0;
-
-  // Sensors Data format expected in Raw bytes only.
-  // Sensors data format is not mandated in the API.
-  // This channel type can be used by clients who know how to interpret the sensor data from respective sensor source.
-   DIRECT_CHANNEL_TYPE_GENERIC_CHANNEL = 1;
-}
-
-// stream id for different direct channel streams
-message sns_direct_channel_stream_id {
-  // sensor responsible for data
-  required sns_std_suid suid  = 1;
-  // if set to true,  auto calibrated data is generated
-  // if set to false, factory calibrated data is generated
-  optional bool calibrated    = 2 [default = true];
-  // if set to true,  resampled data is generated at rate which is at most twice the requested rate
-  // if set to false, data is generated at native rate supported by driver, advertised with attributes - SNS_STD_SENSOR_ATTRID_RATES and SNS_STD_SENSOR_ATTRID_ADDITIONAL_LOW_LATENCY_RATES
-  optional bool resampled     = 3 [ default = true];
-}
-
-
-// Direct channel Creation Request Message
-message sns_direct_channel_create_msg {
-  // ION fd, size to get Virtual address that can be used by Q6
-  message shared_buffer_config {
-    required fixed32 fd   = 1;
-    required fixed32 size = 2;
-  }
-
-  required shared_buffer_config     buffer_config  = 1;
- 
-  // Each channel can be either DIRECT_CHANNEL_TYPE_STRUCTURED_MUX_CHANNEL or DIRECT_CHANNEL_TYPE_GENERIC_CHANNEL
-  // e.g Android Direct Report Channel for DIRECT_CHANNEL_TYPE_STRUCTURED_MUX_CHANNEL
-  required direct_channel_type      channel_type   = 2 ;
-
-  // Processor hosting the sensor data client
-  // Default processor is Application Processor
-  optional sns_std_client_processor client_proc    = 3 [ default = SNS_STD_CLIENT_PROCESSOR_APSS];
-}
-
-
-// Client request on Direct Channel
-message sns_direct_channel_set_client_req {
-  // msg id for sns_std_request, see sns_std.proto for more information.
-  required fixed32                                  msg_id     = 1;
-
-  // unique id for each stream on the channel
-  required sns_direct_channel_stream_id             stream_id  = 2;
-
-  // generic sns_std_request
-  required sns_std_request                          request    = 3;
-
-  // required attributes for DIRECT_CHANNEL_TYPE_STRUCTURED_MUX_CHANNEL
-  message structured_mux_channel_stream_attributes {
-    // Unique handle per sensor, client has to supply for mapping in sensor hub to "sensor_event_t::sensor" variable
-    required fixed32 sensor_handle = 1;
-    // Corresponds to android sensor type, client has to supply for mapping in sensor hub to "sensor_event_t::type" variable
-    required fixed32   sensor_type = 2;
-  }
-
-  optional structured_mux_channel_stream_attributes attributes = 4;
-}
-
-
-// Direct Channel remove client request message
-message sns_direct_channel_remove_client_req {
-  required sns_direct_channel_stream_id stream_id = 1;
-}
-
-
-// Clients interested in Client Time Domain Time Stamp has to supply offset value
-// direct channel in sensor hub adds this value to its own time domain time stamp to generate Client Time Domain Time Stamp
-message sns_direct_channel_set_ts_offset {
-  required fixed64 ts_offset = 1;
-}
-
-
-// Direct Channel Configuration Message
-message sns_direct_channel_config_msg {
-
-  oneof channel_config_msg_payload
-  {
-    sns_direct_channel_set_client_req     set_client_req      = 100;
-
-    sns_direct_channel_remove_client_req  remove_client_req   = 101;
-
-    sns_direct_channel_set_ts_offset      set_ts_offset       = 102;
-  }
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_dpc.proto b/proprietary/vendor/etc/sensors/proto/sns_dpc.proto
deleted file mode 100644
index bbc27d7..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_dpc.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-// @file sns_dpc.proto
-//
-// Defines message types for the DPC(Device Position Classifier) Sensor.
-//
-// Copyright (c) 2017-2018, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The DPC Sensor provides device position information
-
-// DPC Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "device_position_classifier"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for DPC Sensor
-enum sns_dpc_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  //send to new client immediatly to inform current device position
-  SNS_DPC_MSGID_SNS_DPC_EVENT_CONFIG = 777;
-
-  //send when detect device position change
-  SNS_DPC_MSGID_SNS_DPC_EVENT = 1030;
-}
-
-// Stream events:
-//
-// The sns_dpc_event message is used to publish updated device position
-// The sns_dpc_event_config message is sent immediately to new client to inform the current device position
-
-enum sns_dpc_state
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // when algo cannot identify other states
-  SNS_DPC_UNKNOWN         = 1;
-  // User keeps the device steady with display at an angle within +/-15 deg with respect to the horizontal plane
-  SNS_DPC_FLAT_STATIC     = 2;
-  // Device is not in FLAT_STATIC state and proximity sensor detects NEAR
-  SNS_DPC_HIDDEN          = 3;
-  // User picks up the device
-  SNS_DPC_IN_HAND         = 4;
-  // User keeps the device steady with display at an angle greater than +/-15 deg with respect to the horizontal plane
-  SNS_DPC_FACING          = 5;
-}
-
-// Events types from DPC Sensor
-message sns_dpc_event
-{
-  required sns_dpc_state dpc_state = 1;
-}
-
-message sns_dpc_event_config
-{
-  //current dpc state
-  required sns_dpc_state dpc_state = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_eqm.proto b/proprietary/vendor/etc/sensors/proto/sns_eqm.proto
deleted file mode 100644
index 5f08323..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_eqm.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// @file sns_eqm.proto
-//
-// Defines standard message types for the eqm 
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_eqm_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_EQM_MSGID_SNS_DATA = 1058;
-}
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the eqm sensor.
-message sns_eqm_data
-{
-     // todo now upstream 2 data, here should change?
-     required float eqm_state_1 = 1;
-     required float eqm_state_2 = 2;
-     required float eqm_state_3 = 3;
-     required float eqm_state_4 = 4;
-     required float eqm_state_5 = 5;
-     required float eqm_state_6 = 6;
-     required float eqm_state_7 = 7;
-     required float eqm_state_8 = 8;
-     required float eqm_state_9 = 9;
-     required float eqm_state_10 = 10;
-     required float eqm_state_11 = 11;
-     required float eqm_state_12 = 12;
-     required float eqm_state_13 = 13;
-     required float eqm_state_14 = 14;
-     required float eqm_state_15 = 15;
-     required float eqm_state_16 = 16;
-
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ext_svc.proto b/proprietary/vendor/etc/sensors/proto/sns_ext_svc.proto
deleted file mode 100644
index 7e8370a..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ext_svc.proto
+++ /dev/null
@@ -1,72 +0,0 @@
-// @file sns_ext_svc.proto
-//
-// Sensor provides access to external QMI services.
-//
-// This Sensor will create a connection to the external service upon
-// receipt of the first request. Subsequent requests will be sent upon the
-// same connection. The connection will be closed after the client closes
-// the data stream.
-//
-// An error event will be sent upon any received error, including upon
-// the error callback. It is then the responsibility of the client to close
-// the data stream, and re-open a new one if desired.
-//
-// Copyright (c) 2017, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-
-enum sns_ext_svc_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Send a request message
-  SNS_EXT_SVC_MSGID_SNS_EXT_SVC_REQ = 512;
-
-  // Asynchronously received response message
-  SNS_EXT_SVC_MSGID_SNS_EXT_SVC_RESP = 768;
-
-  // Asynchronously received indication message
-  SNS_EXT_SVC_MSGID_SNS_EXT_SVC_IND = 1024;
-}
-
-message sns_ext_svc_req
-{
-  required uint32 svc_id = 1;
-
-  // QMI/IDL Message ID
-  required int32 msg_id = 2;
-
-  // Client-specified transaction ID, to be returned in sns_ext_svc_resp
-  optional int32 transaction_id = 3;
-
-  // Contains the QMI-decoded request message.
-  required bytes payload = 4;
-}
-
-message sns_ext_svc_resp
-{
-  // QMI/IDL Message ID
-  required int32 msg_id = 1;
-
-  // Transport error, as defined in qmi_client.h; Defaults to QMI_NO_ERR
-  required int32 transp_err = 2;
-
-  // Client-specified transaction ID, as provided in sns_ext_svc_req
-  optional int32 transaction_id = 3;
-
-  // Contains the QMI-decoded response message
-  // May be empty if transport_err != QMI_NO_ERR
-  required bytes payload = 4;
-}
-
-message sns_ext_svc_ind
-{
-  // QMI/IDL Message ID
-  required int32 msg_id = 1;
-
-  // Contains the QMI-decoded indication message.
-  required bytes payload = 2;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_facing.proto b/proprietary/vendor/etc/sensors/proto/sns_facing.proto
deleted file mode 100644
index 8decd9f..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_facing.proto
+++ /dev/null
@@ -1,60 +0,0 @@
-// @file sns_facing.proto
-//
-// Defines message types for the the facing sensor
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// Facing calculates face up, down and neutral states. Facing will initially start in an
-// unknown state, and later transition to face up, down and neutral. 
-// Neutral state reported to client on demand
-
-// Facing Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "facing"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Facing Sensor
-enum sns_facing_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FACING_MSGID_SNS_FACING_EVENT = 1024;
-}
-
-// Device Facing state detected by Facing sensor
-enum sns_facing_event_state
-{   
-  option (nanopb_enumopt).long_names = false;
-  SNS_FACING_EVENT_STATE_UNKNOWN = 0;
-  //Phone has just moved to a facing-up phone posture
-  //which is defined as screen up.  
-  SNS_FACING_EVENT_STATE_UP = 1;
-  //Phone has just moved to a facing-down phone posture,
-  //which is defined as screen down.
-  SNS_FACING_EVENT_STATE_DOWN = 2;
-  //Phone has just left either the facing-up  
-  //or the facing-down phone posture
-  SNS_FACING_EVENT_STATE_NEUTRAL = 3;
-}
-
-// Event Message
-// Output data event generated by the facing sensor.
-message sns_facing_event
-{ 
- // Facing sensor state info 
- required sns_facing_event_state state = 1[default = SNS_FACING_EVENT_STATE_UNKNOWN];
-}
-
-// Stream events:
-//
-// The sns_facing_event message is used to publish updated state
-//
-// Facing sensor does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_flicker.proto b/proprietary/vendor/etc/sensors/proto/sns_flicker.proto
deleted file mode 100644
index 545d186..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_flicker.proto
+++ /dev/null
@@ -1,87 +0,0 @@
-// @file sns_flicker.proto
-//
-// Defines the API for Proximity Sensors.
-// All Proximity Sensor drivers are required to comply with this API.
-// Any new functionality for Proximity Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Proximity Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "flicker".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute is not applicable since this
-//    is an event sensor.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in cm unit (flicker distance).
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Proximity Sensor supports both streaming and on-change
-//    modes and the operating mode is configured in the Registry.
-// 2. The streaming Proximity Sensor handles the sns_std_sensor_config request
-//    for all stream enable/update requests.
-// 3. The on-change Proximity Sensor handles the
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG request for
-//    all stream enable/update requests.
-// 4. In on-change mode the Sensor uses interrupt operation and reports
-//    samples only for NEAR/FAR transitions.
-
-// Message IDs for flicker Sensor
-enum sns_flicker_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_flicker_event
-  // Purpose: An output data event from the flicker sensor to it's client.
-  SNS_FLICKER_MSGID_SNS_FLICKER_EVENT  = 769;
-}
-
-
-// Events types from flicker Sensor
-message sns_flicker_event
-{
-  required int32 flicker_hw = 1;
-  required int32 clear_buffer = 2;
-
-  // Proximity sensor sample status
-  required sns_std_sensor_sample_status status = 3 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-  repeated float f =4 [(nanopb).max_count = 120];
-}
-
-// Handling stream events:
-// 1. The Proximity Sensor publishes object flicker data stream events
-//    using sns_flicker_event message.
-// 2. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 3. The Proximity Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
-// Handling self-test requests:
-// 1. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for Proximity Sensor calibrates
-//    the sensor to detect an object (including light and dark colored)
-//    at 5cm distance from the physical sensor.
-// 3. The Proximity Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Proximity Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_fmv.proto b/proprietary/vendor/etc/sensors/proto/sns_fmv.proto
deleted file mode 100644
index a6bdfb0..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_fmv.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// @file sns_fmv.proto
-//
-// Defines the API for Filtered Magnetic Vector.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A FMV sensor reports the filtered magnetic vector
-//
-// ## FMV sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "fmv"
-//
-// ## Request Message: sns_std_sensor_config
-// sns_std_sensor_config::sample_rate is used to specify the sampling rate (Hz)
-// of the FMV sensor. Sensor will generate data events at this rate.
-//
-// ## Event Message: sns_std_sensor_event
-// 1. Output of the FMV sensor will be populated in sns_std_sensor_event
-// 2. Each stream event contains three output data fields in µT (micro Tesla)
-// 3. Data in the stream is adjusted to Android coordinate system relative to a
-//    mobile device held with screen facing the user in it's natural orientation:
-//    X-axis: parallel to the screen pointing to the right
-//    Y-axis: parallel to the screen pointing to the top
-//    Z-axis: perpendicular to the screen pointing towards the user
-// 4. Data in the stream event is ordered as: 
-//    data[0] = X-axis
-//    data[1] = Y-axis
-//    data[2] = Z-axis
-// 5. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-//
-// sns_std_sensor_event::status specifies the reliability of the sample value
-// value is of type sns_std_sensor_sample_status. see sns_std_sensor.proto for
-// details.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_formatter.proto b/proprietary/vendor/etc/sensors/proto/sns_formatter.proto
deleted file mode 100644
index 7c32bed..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_formatter.proto
+++ /dev/null
@@ -1,121 +0,0 @@
-// @file sns_offset_formatter.proto
-//
-// Defines standard message types for the Offset/Formatter sensor
-//
-// Copyright (c) 2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_type.proto";
-import "sns_std_sensor.proto";
-
-enum sns_formatter_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FORMATTER_MSGID_SNS_FORMATTER_REQUEST                = 512;
-  SNS_FORMATTER_MSGID_SNS_FORMATTER_METRIC_DATA_REQUEST    = 513;
-
-  SNS_FORMATTER_MSGID_SNS_FORMATTER_OUTPUT_EVENT           = 1024;
-  SNS_FORMATTER_MSGID_SNS_FORMATTER_ACK_EVENT              = 1025;
-}
-
-enum sns_formatter_request_values {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FORMATTER_REQUEST_INVALID  = 0;
-  // Creates a new instance of a metric with given id.
-  SNS_FORMATTER_REQUEST_CREATE   = 1;
-  // Starts or resumes the update of the metric instances.
-  SNS_FORMATTER_REQUEST_START    = 2;
-  // Pauses the update of the metric instances.
-  SNS_FORMATTER_REQUEST_STOP     = 3;
-  // Resets metric instance state.
-  SNS_FORMATTER_REQUEST_RESET    = 4;
-  // Destroys the metric instance. Release the resources for that instance.
-  SNS_FORMATTER_REQUEST_DESTROY  = 5;
-  // Set the config data based on the group name.
-  SNS_FORMATTER_REQUEST_CONFIG_SET   = 6;
-  // fetch the config data based on the group name.
-  SNS_FORMATTER_REQUEST_CONFIG_GET   = 7;
-  // Updates the batch period at the client manager.
-  SNS_FORMATTER_REQUEST_BATCH        = 8;
-}
-
-enum sns_formatter_status_values {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FORMATTER_STATUS_FAILURE        = 0;
-  SNS_FORMATTER_STATUS_INVALID_PARAM  = 1;
-  SNS_FORMATTER_STATUS_SUCCESS        = 2;
-}
-
-enum sns_formatter_client_id {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FORMATTER_CLIENT_BG   = 0;
-  SNS_FORMATTER_CLIENT_APPS = 1;
-}
-
-enum sns_formatter_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FORMATTER_OUTPUT_DATA_EVENT     = 0;
-  SNS_FORMATTER_OUTPUT_BUFFER_EVENT   = 1;
-  SNS_FORMATTER_CONFIG_DATA_EVENT     = 2;
-}
-
-// "UNUSED" is filled by clients for strings which are
-// not applicable for a given sns_formatter-request_values id.
-message sns_formatter_config_payload {
-  optional sns_std_suid            metric_sensor_suid = 1;
-  required sns_std_suid            formatter_suid    = 2;
-  required float                   sample_rate       = 3;
-  required string                  format_input_str  = 4;
-  required string                  metric_name       = 5;
-  required string                  group_name        = 7;
-  required string                  sensor_config_data = 8;
-}
-
-message sns_formatter_output_event_payload
-{
-  required bytes                        data       = 1;
-  required sns_std_sensor_sample_status status     = 2;
-  required sns_formatter_event_type     event_type = 3;
-}
-
-// Formatter config message
-// Used by clients to configure the formatter for various metrics
-message sns_formatter_request
-{
-  required sns_formatter_request_values msg_id                = 1;
-  required fixed32                      metric_id             = 2;
-  required sns_formatter_client_id client_id                  = 3;
-  optional sns_formatter_config_payload payload               = 4;
-  optional sns_formatter_output_event_payload  event_payload  = 5;
-}
-
-message sns_formatter_metric_data_request
-{
-  required fixed32     metric_id    = 1;
-  required bytes       metric_data  = 2;
-}
-
-// Formatter output event
-// This event contains the formatted string output corresponding to the
-// metric requested by the client.
-message sns_formatter_output_event
-{
-  required fixed32                      metric_id         = 1;
-  required string                       formatted_output  = 2;
-  required sns_formatter_output_event_payload  event_payload     = 3;
-}
-
-// Formatter acknowledge event
-// This event contains the status for the request sent from the client.
-// Status indicates if the requested format string was valid or not.
-message sns_formatter_ack_event
-{
-  required fixed32                     metric_id  = 1;
-  required sns_formatter_status_values status     = 2;
-}
\ No newline at end of file
diff --git a/proprietary/vendor/etc/sensors/proto/sns_free_fall.proto b/proprietary/vendor/etc/sensors/proto/sns_free_fall.proto
deleted file mode 100644
index 3729872..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_free_fall.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// @file sns_free_fall.proto
-//
-// Defines standard message types for Free Fall Sensor. All physical Sensor
-// drivers that support Free Fall Sensor are required to support the
-// event messages as defined in this file.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-
-// Attribute requirements:
-// The Free Fall Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "free_fall".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS, SNS_STD_SENSOR_ATTRID_RANGES,
-//    SNS_STD_SENSOR_ATTRID_RATES attributes are not applicable since this is
-//    a single output sensor.
-// 3. See sns_std_sensor.proto for other attributes.
-
-
-// Handling stream requests:
-// 1. A message with ID SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is an
-//    enable request to the free fall sensor.
-// 2. A client deletes the data stream with free_fall Sensor to disable it's
-//    original enable request.
-
-// Message IDs for free_fall Sensor
-enum sns_free_fall_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // The free_fall Sensor publishes an event with this message ID
-  SNS_FREE_FALL_MSGID_SNS_FREE_FALL_EVENT  = 773;
-}
-
-enum sns_free_fall_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_FREE_FALL_EVENT_TYPE_DISABLED = 0;
-  SNS_FREE_FALL_EVENT_TYPE_ENABLED  = 1;
-  SNS_FREE_FALL_EVENT_TYPE_FIRED    = 2;
-}
-
-// Events types from free fall Sensor
-message sns_free_fall_event
-{
-  required sns_free_fall_event_type free_fall_event_type = 1 [default = SNS_FREE_FALL_EVENT_TYPE_DISABLED];
-}
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_fw.proto b/proprietary/vendor/etc/sensors/proto/sns_fw.proto
deleted file mode 100644
index c29a1af..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_fw.proto
+++ /dev/null
@@ -1,23 +0,0 @@
-// @file sns_fw.proto
-//
-// Defines Framework internal values.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-
-// Internal Framework message IDs
-// Note: These message IDs must not conflict with those in sns_std_msgid
-enum sns_fw_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Special message only sent by the Framework; not processed by Sensors
-  // Empty Message
-  SNS_FW_MSGID_SNS_DESTROY_REQ = 120;
-
-  // Special message only sent by the Framework; not processed by Sensors
-  // Empty Message
-  SNS_FW_MSGID_SNS_DESTROY_COMPLETE_EVENT = 250;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_game_rv.proto b/proprietary/vendor/etc/sensors/proto/sns_game_rv.proto
deleted file mode 100644
index 6f0f3df..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_game_rv.proto
+++ /dev/null
@@ -1,48 +0,0 @@
-// @file sns_game_rv.proto
-//
-// Defines the API for Game Rotation Vector sensors
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A GameRV sensor reports the orientation of the device relative to an
-// unspecified coordinates frame. It is obtained by integration of
-// accelerometer and gyroscope readings. Therefore the Y axis doesn't point
-// north but instead to an arbitrary reference.
-//
-// ## GameRV sensor attributes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE is "game_rv"
-//
-// ## Request Message: sns_std_sensor_config
-// sns_std_sensor_config::sample_rate is used to specify the sampling rate (Hz)
-// of the GameRV sensor. Sensor will generate data events at this rate.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the GameRV sensor will be populated in sns_std_sensor_event
-//
-// The orientation is represented by the rotation necessary to align
-// the coordinate frame with the device's coordinates. That is,
-// applying the rotation to the world frame (X,Y,Z) would align them with
-// the device coordinates (x,y,z).
-//
-// The rotation can be seen as rotating the device by an angle theta around an
-// axis rot_axis to go from the reference device orientation to the current
-// device orientation. The rotation is encoded as the four unitless x, y, z, w
-// components of a unit quaternion:
-// sns_std_sensor_event::data[0] = rot_axis.x*sin(theta/2)
-// sns_std_sensor_event::data[1] = rot_axis.y*sin(theta/2)
-// sns_std_sensor_event::data[2] = rot_axis.z*sin(theta/2)
-// sns_std_sensor_event::data[3] = cos(theta/2)
-//
-// Where:
-// - the x, y and z fields of rot_axis are the East-North-Up coordinates
-// of a unit length vector representing the rotation axis
-// - theta is the rotation angle
-//
-// sns_std_sensor_event::status specifies the reliability of the sample value
-// value is of type sns_std_sensor_sample_status. see sns_std_sensor.proto for
-// details.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_geomag_rv.proto b/proprietary/vendor/etc/sensors/proto/sns_geomag_rv.proto
deleted file mode 100644
index 98b2b18..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_geomag_rv.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// @file sns_geomag_rv.proto
-//
-// Defines the API for Geomagnetic Rotation Vector sensors.
-// This Sensor is similar to Rotation Vector, but uses a magnetometer instead
-// of a gyroscope.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A GeoMagRV sensor reports the orientation of the device relative to the
-// East-North-Up coordinates frame. It is obtained by integration of
-// accelerometer and magnetometer readings.
-//
-// ## GeoMagRV sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "geomag_rv"
-//
-// ## Request Message: sns_std_sensor_config
-// sns_std_sensor_config::sample_rate is used to specify the sampling rate (Hz)
-// of the GeoMagRV sensor. Sensor will generate data events at this rate.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the GeoMagRV sensor will be populated in sns_std_sensor_event
-//
-// The East-North-Up coordinate system is defined as a direct orthonormal
-// basis where:
-// - X points east and is tangential to the ground.
-// - Y points north and is tangential to the ground.
-// - Z points towards the sky and is perpendicular to the ground.
-//
-// The rotation can be seen as rotating the device by an angle theta around an
-// axis rot_axis to go from the reference device orientation to the current
-// device orientation. The rotation is encoded as the four unitless x, y, z, w
-// components of a unit quaternion:
-// sns_std_sensor_event::data[0] = rot_axis.x*sin(theta/2)
-// sns_std_sensor_event::data[1] = rot_axis.y*sin(theta/2)
-// sns_std_sensor_event::data[2] = rot_axis.z*sin(theta/2)
-// sns_std_sensor_event::data[3] = cos(theta/2)
-//
-// Where:
-// - the x, y and z fields of rot_axis are the East-North-Up coordinates
-// of a unit length vector representing the rotation axis
-// - theta is the rotation angle
-//
-// sns_std_sensor_event::status specifies the reliability of the sample value
-// value is of type sns_std_sensor_sample_status. see sns_std_sensor.proto for
-// details.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_gravity.proto b/proprietary/vendor/etc/sensors/proto/sns_gravity.proto
deleted file mode 100644
index 6a04f14..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_gravity.proto
+++ /dev/null
@@ -1,30 +0,0 @@
-// @file sns_gravity.proto
-//
-// Defines standard message types for the Gravity Sensor
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// Configuration Message
-// Used to either request for a certain configuration of the gravity sensor or
-// alter an already existing configuration of the gravity sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the gravity sensor in hertz
-
-// Data Message
-// Data event generated by the gravity.
-// Uses sns_std_sensor_event message defined in sns_std_sensor.proto
-// The data field of the sns_std_sensor_event message
-// contains a float array of length 6 with the following definition
-// 1) float data[0] to data[2]
-//      Representing the gravity values along x,y,z axes in m/s2.
-// 2) float data[3] to data[5]
-//      Representing the linear acceleration values along x,y,z axes in m/s2.
-//      Determined as the delta between the accel and the gravity values
-//      along that axis.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_gyro.proto b/proprietary/vendor/etc/sensors/proto/sns_gyro.proto
deleted file mode 100644
index 03f1bc5..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_gyro.proto
+++ /dev/null
@@ -1,74 +0,0 @@
-// @file sns_gyro.proto
-//
-// Defines the API for Gyroscope Sensors.
-// All Gyroscope Sensor drivers are required to comply with this API.
-// Any new functionality for Gyroscope Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Gyroscope Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "gyro".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in (radians/sec)/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in radians/sec unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Gyroscope Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-// 2. The Gyroscope Sensor uses batching_period item in
-//    sns_std_request as the requested batching rate to determine
-//    hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Gyroscope Sensor publishes device rotation data stream events
-//    using the sns_std_sensor_event message.
-// 2. Each stream event contains three output data fields where data is
-//    in radians/sec units and is factory calibrated.
-// 3. Data in the stream is adjusted to Android coordinate system relative to a
-//    mobile device held with screen facing the user in it's natural orientation:
-//    X-axis: parallel to the screen pointing to the right
-//    Y-axis: parallel to the screen pointing to the top
-//    Z-axis: perpendicular to the screen pointing towards the user
-//    This conforms to the mobile device axes orientation as specified by the
-//    Android Sensor API.
-// 4. Data in the stream event is ordered as:
-//    data[0] = X-axis
-//    data[1] = Y-axis
-//    data[2] = Z-axis
-// 5. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 6. The Gyroscope Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 7. The Gyroscope Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and comp_matrix fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-// Handling self-test requests:
-// 1. The Gyroscope Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Gyroscope Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Gyroscope Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Gyroscope Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_gyro_cal.proto b/proprietary/vendor/etc/sensors/proto/sns_gyro_cal.proto
deleted file mode 100644
index 279c070..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_gyro_cal.proto
+++ /dev/null
@@ -1,32 +0,0 @@
-// @file sns_gyro_cal.proto
-//
-// Defines message types for the Gyro Calibration Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_cal.proto";
-
-// The Gyro Calibration Sensor determines the calibration parameters
-// for gyro sensor
-
-// Gyro Calibration Sensor Attributes:
-// - SNS_STD_SENSOR_ATTRID_TYPE: "gyro_cal"
-// - SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG message ID is used to
-//      enable the sensor
-// - SNS_CAL_MSGID_SNS_CAL_RESET message ID is used to reset the algorithm
-//      and any previously determined calibration parameters.
-
-// Stream Events:
-// - SNS_CAL_MSGID_SNS_CAL_EVENT message ID is used to report calibration
-//      parameters to the client of the sensor. The sns_cal_event message as
-//      defined in sns_cal.proto is used to report this data event where the
-//      units for the bias field in the message are in rad / s
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_gyro_rot_matrix.proto b/proprietary/vendor/etc/sensors/proto/sns_gyro_rot_matrix.proto
deleted file mode 100644
index 06a1c54..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_gyro_rot_matrix.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// @file sns_gyro_rot_matrix.proto
-//
-// Defines standard message types for the Gyro Rotation Matrix
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_gyro_rot_matrix_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_GYRO_ROT_MATRIX_MSGID_SNS_STD_SENSOR_EVENT = 1024;
-}
-
-// Data Message
-// Data event generated by the gyro rotation matrix.
-// Uses sns_std_sensor_event message defined in sns_std_sensor.proto
-// The data field of the sns_std_sensor_event message
-// contains a float array of length 10 with the following definition
-// 1) float data[0] to data[8]
-//      3 by 3 Gyro Rotation Matrix output
-//      Representing the rotation from previously sampled gyro values
-//      to the current one.
-//      The matrix definition is as follows:
-//      curr_gyro_XYZ[3X1] = gyro_rot_matrix[3X3] * prev_gyro_XYZ[3X1]
-//      data[0] = gyro_rot_matrix[0,0]
-//      data[1] = gyro_rot_matrix[0,1]
-//      data[2] = gyro_rot_matrix[0,2]
-//      data[3] = gyro_rot_matrix[1,0]
-//      data[4] = gyro_rot_matrix[1,1]
-//      data[5] = gyro_rot_matrix[1,2]
-//      data[6] = gyro_rot_matrix[2,0]
-//      data[7] = gyro_rot_matrix[2,1]
-//      data[8] = gyro_rot_matrix[2,2]
-// 2) float data[9]
-//      Gyro Norm of the currently sampled gyro data
-//      determined as the sum of squares of gyro on each of the axes
-//      i.e. curr_gyro_X^2 + curr_gyro_Y^2 + curr_gyro_Z^2
-
-// Configuration Message
-// Used to either request for a certain configuration of the Gyro Rotation Matrix Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Gyro Rotation Matrix sensor in hertz
diff --git a/proprietary/vendor/etc/sensors/proto/sns_hall.proto b/proprietary/vendor/etc/sensors/proto/sns_hall.proto
deleted file mode 100644
index a779844..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_hall.proto
+++ /dev/null
@@ -1,82 +0,0 @@
-// @file sns_hall.proto
-//
-// Defines the API for Hall Sensors.
-// All Hall Sensor drivers are required to comply with this API.
-// Any new functionality for Hall Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018, 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Hall Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "hall".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute is not applicable since this is an event
-//    sensor.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values as 0 and 1.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Hall Sensor handles the SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-//    message ID for all stream enable/update requests.
-// 2. The Hall Sensor operates in on-change mode and report
-//    samples only for magnet NEAR/FAR transitions.
-
-// Message IDs for hall Sensor
-enum sns_hall_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_hall_event
-  // Purpose: An output data event from the hall sensor to it's client.
-  SNS_HALL_MSGID_SNS_HALL_EVENT  = 770;
-}
-
-enum sns_hall_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_HALL_EVENT_TYPE_FAR = 0;
-  SNS_HALL_EVENT_TYPE_NEAR  = 1;
-}
-
-// Events types from hall Sensor
-message sns_hall_event
-{
-  // Hall NEAR/FAR output event
-  required sns_hall_event_type hall_event_type = 1 [default = SNS_HALL_EVENT_TYPE_FAR];
-
-  // Hall sensor sample status
-  required sns_std_sensor_sample_status status = 2 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-// Handling stream events:
-// 1. The Hall Sensor publishes magnetic field proximity data stream
-//    events using the sns_hall_event message.
-// 2. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 3. The Hall Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
-// Handling self-test requests:
-// 1. The Hall Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Hall Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Hall Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_har.proto b/proprietary/vendor/etc/sensors/proto/sns_har.proto
deleted file mode 100644
index 672da5e..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_har.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-// @file sns_har.proto
-//
-// Defines standard message types for the har
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_har_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_HAR_MSGID_SNS_DATA = 1058;
-}
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the har sensor.
-message sns_har_data
-{
-     // todo now upstream 2 data, here should change?
-     required float har_state = 1;
-
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_heart_beat.proto b/proprietary/vendor/etc/sensors/proto/sns_heart_beat.proto
deleted file mode 100644
index 3b0b2d1..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_heart_beat.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-// @file sns_heart_beat.proto
-//
-// Defines the API for Heart Beat sensors
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A heart beat sensor reports everytime a heart beat peak is detected.
-//
-// Peak ideally corresponds to the positive peak in the QRS complex of
-// an ECG signal, and the event timestamp should correspond to the time this
-// peak occured.
-//
-// The sensor is not expected to be optimized for latency. As a guide, a
-// receipt latency of up to 10 seconds is acceptable.
-//
-// ## Heart Beat sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "heart_beat"
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the Heart Beat sensor will be populated in sns_std_sensor_event.
-//
-// sns_std_sensor_event::data[0] = confidence in the detection of the peak
-//    where 0.0 represent no information at all, and 1.0 represents certainty.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_heart_rate.proto b/proprietary/vendor/etc/sensors/proto/sns_heart_rate.proto
deleted file mode 100644
index c6f90f5..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_heart_rate.proto
+++ /dev/null
@@ -1,55 +0,0 @@
-// @file sns_heart_rate.proto
-//
-// Defines the API for Heart Rate Detection Sensors.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// A sensor of this type returns the current heart rate in beats per minute
-// (BPM).  Because this sensor is on-change, events must be generated when and
-// only when BPM or status have changed since the last event.
-//
-// Upon the first activation, unless the device is known to not be on the
-// body, the status field of the first event must be set to UNRELIABLE.
-//
-// ## Heart Rate sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "heart_rate"
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the Heart Rate sensor will be populated in sns_std_sensor_event.
-//
-// SNS_HEART_RATE_MSGID_SNS_HEART_RATE_EVENT::data[0] = current heart rate in beats per minute (BPM)
-//
-// SNS_HEART_RATE_MSGID_SNS_HEART_RATE_EVENT::status specifies the reliability of the sample value
-// value is of type sns_heart_rate_event_type.
-
-enum sns_heart_rate_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_HEART_RATE_MSGID_SNS_HEART_RATE_EVENT = 779;
-}
-
-enum sns_heart_rate_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_HR_STATUS_NO_CONTACT = -1;
-  SNS_HR_STATUS_UNRELIABLE  = 0;
-  SNS_HR_STATUS_ACCURACY_LOW = 1;
-  SNS_HR_STATUS_ACCURACY_MEDIUM = 2;
-  SNS_HR_STATUS_ACCURACY_HIGH = 3;
-}
-
-// Events types from heart_rate Sensor
-message sns_heart_rate_event
-{
-  required float heart_rate = 1;
-  required sns_heart_rate_event_type heart_rate_event_type = 2 [default = SNS_HR_STATUS_NO_CONTACT];
-}
\ No newline at end of file
diff --git a/proprietary/vendor/etc/sensors/proto/sns_hinge_angle.proto b/proprietary/vendor/etc/sensors/proto/sns_hinge_angle.proto
deleted file mode 100644
index 0e8e8eb..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_hinge_angle.proto
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// @file sns_hinge_angle.proto
-//
-// Defines message types for the Hinge Angle Sensor.
-//
-// Copyright (c) 2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Hinge Angle Sensor detects the angle between two rigid bodies connected by a hinge
-// around which rotation can occur.
-// 
-// The reference position for Hinge Angle measurement constitues the two rigid bodies being
-// parallel to the ground, with surfaces in contact with each other and hinge connecting
-// the left edges of the two rigid bodies.
-// The rigid body that is located below is defined to be the primary rigid body.
-// The rigid body which is located above is defined to be the secondary rigid body. 
-// 
-// The Hinge Angle Sensor detects the angle going from the primary rigid body to the
-// secondary rigid body, measured counter clockwise around the hinge. The maximum range of
-// reported angles will be from 0 degrees to 360 degrees.
-// 
-// A Hinge Angle of 0 degrees is reported when the two rigid bodies have the same surfaces,
-// as described in the reference position, in contact with each other. 
-// 
-// A Hinge Angle of 360 degrees is reported when the two rigid bodies have the opposite
-// surfaces, to those described in the reference position, in contact with each other.
-// 
-// A Hinge Angle of 180 degrees is reported when the two rigid bodies are coplanar.
-
-// Attribute Requirements:
-// Hingle Angle Sensor must support the following attributes
-// SNS_STD_SENSOR_ATTRID_TYPE: "hinge_angle"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-// SNS_STD_SENSOR_ATTRID_RESOLUTIONS: the smallest hinge angle in degrees that
-//   can be detected by the sensor
-// SNS_STD_SENSOR_ATTRID_RANGES: the range of angles detected by the sensor, for
-//   example [0,360]
-
-// Request:
-// A request message with message id SNS_HINGE_ANGLE_MSGID_SNS_HINGE_ANGLE_CONFIG
-// and payload sns_hinge_angle_config is used to enable the Hinge Angle Sensor
-
-// Event:
-// Hinge Angle sensor generates an event with message id
-// SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_EVENT and payload sns_std_sensor_event
-// when hinge angle change is detected
-
-// Message IDs for HINGE_ANGLE Sensor
-enum sns_hinge_angle_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_HINGE_ANGLE_MSGID_SNS_HINGE_ANGLE_CONFIG = 512;
-}
-
-
-// Request Message
-// Used to either request for a new configuration of the Hinge Angle Sensor or
-// alter an already existing configuration
-message sns_hinge_angle_config
-{
-  // Ids of the primary and secondary rigid bodies between which hinge angle
-  // is to be measured. Ids must match the SNS_STD_SENSOR_ATTRID_RIGID_BODY
-  // attributes of the sensors on these rigid bodies that are to be used.
-  repeated int32 rigid_body = 1 [(nanopb).max_count = 2];
-}
-
-
-// Event Message
-// Uses sns_std_sensor_event message defined in sns_std_sensor.proto
-// The data field of the sns_std_sensor_event message contains a 
-// single floating point value representing the detected hinge angle
-// in degrees
-// The status field of the sns_std_sensor_event message contains the 
-// accuracy of the detected hinge angle
-
-
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_humidity.proto b/proprietary/vendor/etc/sensors/proto/sns_humidity.proto
deleted file mode 100644
index 7ae47bc..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_humidity.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// @file sns_humidity.proto
-//
-// Defines the API for Humidity Sensors.
-// All Humidity Sensor drivers are required to comply with this API.
-// Any new functionality for Humidity Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Humidity Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "humidity".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in %RH/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in %RH unit.
-// 4. The Humidity Sensor is an on-change sensor.
-// 5. See sns_std_sensor.proto for other attributes.
-
-
-// Handling stream requests:
-// 1. The Humidity Sensor handles the SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-//    message ID for all stream enable/update requests.
-// 2. The Humidity Sensor supports on-change mode of operation.
-// 3. In on-change mode the Sensor could use interrupt operation and
-//    reports samples for only significant change in humidity.
-//    Example: +/- 5% change.
-
-// Handling stream events:
-// 1. The Humidity Sensor publishes ambient relative humidity data stream
-//    events using the sns_std_sensor_event message.
-// 2. Each stream event contains one output data field where data is
-//    factory calibrated and ordered as:
-//    data[0] = Humidity data in %RH (% Relative Humidity)
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Humidity Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Humidity Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The Humidity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Humidity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Humidity Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Humidity Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_mag.proto b/proprietary/vendor/etc/sensors/proto/sns_mag.proto
deleted file mode 100644
index 174bfa5..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_mag.proto
+++ /dev/null
@@ -1,75 +0,0 @@
-// @file sns_mag.proto
-//
-// Defines the API for Magnetometer Sensors.
-// All Magnetometer Sensor drivers are required to comply with this API.
-// Any new functionality for Magnetometer Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Magnetometer Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "mag".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in µT/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in µT unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Magnetometer Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-// 2. If the physical sensor supports hardware FIFO then the Magnetometer
-//    Sensor uses batching_period item in sns_std_request as the requested
-//    batching rate to determine hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Magnetometer Sensor publishes ambient magnetic field data events
-//    using the sns_std_sensor_event message.
-// 2. Each stream event contains three output data fields where data is
-//    in µT (micro Tesla) units and is factory calibrated.
-// 3. Data in the stream is adjusted to Android coordinate system relative to a
-//    mobile device held with screen facing the user in it's natural orientation:
-//    X-axis: parallel to the screen pointing to the right
-//    Y-axis: parallel to the screen pointing to the top
-//    Z-axis: perpendicular to the screen pointing towards the user
-//    This conforms to the mobile device axes orientation as specified by the
-//    Android Sensor API.
-// 4. Data in the stream event is ordered as:
-//    data[0] = X-axis
-//    data[1] = Y-axis
-//    data[2] = Z-axis
-// 5. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 6. The Magnetometer Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 7. The Magnetometer Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and comp_matrix fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The Magnetometer Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Magnetometer Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Magnetometer Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Magnetometer Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_mag_cal.proto b/proprietary/vendor/etc/sensors/proto/sns_mag_cal.proto
deleted file mode 100644
index d6fc026..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_mag_cal.proto
+++ /dev/null
@@ -1,32 +0,0 @@
-// @file sns_mag_cal.proto
-//
-// Defines message types for the Mag Calibration Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_cal.proto";
-
-// The Mag Calibration Sensor determines the calibration parameters
-// for magnetometer sensor
-
-// Mag Calibration Sensor Attributes:
-// - SNS_STD_SENSOR_ATTRID_TYPE: "mag_cal"
-// - SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG message ID is used to
-//      enable the sensor
-// - SNS_CAL_MSGID_SNS_CAL_RESET message ID is used to reset the algorithm
-//      and any previously determined calibration parameters.
-
-// Stream Events:
-// - SNS_CAL_MSGID_SNS_CAL_EVENT message ID is used to report calibration
-//      parameters to the client of the sensor. The sns_cal_event message as
-//      defined in sns_cal.proto is used to report this data event where the
-//      units for the bias field in the message are in micro Tesla.
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_oem1.proto b/proprietary/vendor/etc/sensors/proto/sns_oem1.proto
deleted file mode 100644
index a331eb2..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_oem1.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-// @file sns_oem1.proto
-//
-// Defines standard message types for the OEM1
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_oem1_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OEM1_MSGID_SNS_OEM1_DATA = 1024;
-}
-
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the oem1 sensor.
-message sns_oem1_data
-{
-  // oem1 Vector along axis x,y,z in m/s2
-  repeated float oem1 = 1 [(nanopb).max_count = 3];
-
-  // Accuracy of the data
-  required sns_std_sensor_sample_status accuracy = 2;
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_oem15.proto b/proprietary/vendor/etc/sensors/proto/sns_oem15.proto
deleted file mode 100644
index 3ee7b91..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_oem15.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-// @file sns_oem15.proto
-//
-// Defines standard message types for the OEM3
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_oem15_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OEM15_MSGID_SNS_OEM15_DATA = 1024;
-}
-
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the oem3 sensor.
-message sns_oem15_data
-{
-  // oem3 Vector along axis x,y,z in m/s2
-  repeated float oem15 = 1 [(nanopb).max_count = 3];
-
-  // Accuracy of the data
-  required sns_std_sensor_sample_status accuracy = 2;
-}
\ No newline at end of file
diff --git a/proprietary/vendor/etc/sensors/proto/sns_oem2.proto b/proprietary/vendor/etc/sensors/proto/sns_oem2.proto
deleted file mode 100644
index ce41242..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_oem2.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-// @file sns_oem2.proto
-//
-// Defines standard message types for the OEM2
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_oem2_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OEM2_MSGID_SNS_OEM2_DATA = 1024;
-}
-
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the oem2 sensor.
-message sns_oem2_data
-{
-  // oem2 Vector along axis x,y,z in m/s2
-  repeated float oem2 = 1 [(nanopb).max_count = 3];
-
-  // Accuracy of the data
-  required sns_std_sensor_sample_status accuracy = 2;
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_oem3.proto b/proprietary/vendor/etc/sensors/proto/sns_oem3.proto
deleted file mode 100644
index 0ee3ea6..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_oem3.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-// @file sns_oem3.proto
-//
-// Defines standard message types for the OEM3
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_oem3_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OEM3_MSGID_SNS_OEM3_DATA = 1024;
-}
-
-
-// Configuration Message
-// Used to either request for a certain configuration of the Sim Sensor or
-// alter an already existing configuration of the Simulation Sensor
-// Uses sns_std_sensor_config defined in sns_std_sensor.proto
-// The message field definitions are as follows:
-// 1) float sample_rate
-//      containing the required sample rate of the Sim sensor in hertz
-
-// Data Message
-// Output data event generated by the oem3 sensor.
-message sns_oem3_data
-{
-  // oem3 Vector along axis x,y,z in m/s2
-  repeated float oem3 = 1 [(nanopb).max_count = 3];
-
-  // Accuracy of the data
-  required sns_std_sensor_sample_status accuracy = 2;
-}
-
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_offbody_detect.proto b/proprietary/vendor/etc/sensors/proto/sns_offbody_detect.proto
deleted file mode 100644
index b198b6d..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_offbody_detect.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// @file sns_offbody_detect.proto
-//
-// Defines the API for Offbody Detection Sensors.
-//
-// Copyright (c) 2017-2018,2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-
-// An offbody detect sensor reports every time the device transitions from
-// off-body to on-body and from on-body to off-body (e.g. a wearable device
-// being removed from the wrist would trigger an event indicating an off-body
-// transition).
-//
-// This sensor must be able to detect and report an on-body to off-body
-// transition within 1 second of the device being removed from the body,
-// and must be able to detect and report an off-body to on-body transition
-// within 5 seconds of the device being put back onto the body.
-//
-// ## Offbody Detection sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "offbody_detect"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-//
-// ## Event Message: SNS_OFFBODY_DETECT_MSGID_SNS_OFFBODY_DETECT_EVENT
-
-// Message IDs for Offbody Detection Sensor
-enum sns_offbody_detect_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OFFBODY_DETECT_MSGID_SNS_OFFBODY_DETECT_EVENT = 772;
-}
-
-enum sns_offbody_detect_event_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Current state is unknown: not yet detected
-  SNS_OFFBODY_DETECT_EVENT_TYPE_UNKNOWN     = 0;
-  // Device has been detected to be on-body
-  SNS_OFFBODY_DETECT_EVENT_TYPE_ON          = 1;
-  // Device has been detected to be off-body
-  SNS_OFFBODY_DETECT_EVENT_TYPE_OFF         = 2;
-}
-
-message sns_offbody_detect_event
-{
-  // Detected state
-  required sns_offbody_detect_event_type state = 1 [default = SNS_OFFBODY_DETECT_EVENT_TYPE_UNKNOWN];
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ois_manager.proto b/proprietary/vendor/etc/sensors/proto/sns_ois_manager.proto
deleted file mode 100644
index e513f50..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ois_manager.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// @file sns_ois_cal.proto
-//
-// Defines the API for ois manager.
-//
-// Copyright (c) 2019 AKM, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - AKM, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// Message IDs for ois manager
-enum sns_ois_manager_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_OIS_MANAGER_MSGID_SNS_SET_OIS_MODE = 525;
-
-  SNS_OIS_MANAGER_MSGID_SNS_OIS_CONFIG = 526;
-
-  SNS_OIS_MANAGER_MSGID_SNS_OIS_MANAGER_EVENT = 1024;
-}
-
-message sns_set_ois_mode
-{
-  required int32 ois_gain_x   = 1;
-  required int32 ois_gain_y   = 2;
-  required int32 ois_delay_x  = 3;
-  required int32 ois_delay_y  = 4;
-  required int32 ois_offset_x = 5;
-  required int32 ois_offset_y = 6;
-  required int32 mode = 7;
-}
-
-message sns_ois_config
-{
-  required int32 mode     = 1;
-  required int32 posture  = 2;
-  required int32 af_fb    = 3;
-}
-
-message sns_ois_manager_event
-{
-  repeated float data  = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_pedometer.proto b/proprietary/vendor/etc/sensors/proto/sns_pedometer.proto
deleted file mode 100644
index 4b1e1b1..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_pedometer.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// @file sns_pedometer.proto
-//
-// Defines message types for the Pedometer Sensor.
-//
-// Copyright (c) 2017-2019 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Pedometer Sensor detects steps taken by the user
-//
-// The Pedometer step event includes the latest step count accumulated since 
-// activation.
-// All clients to Pedometer get the same step event.
-// The timestamp of the event indicates the time of the latest detected step.
-
-// Pedometer Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "pedometer"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Pedometer Sensor
-enum sns_pedometer_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_PEDOMETER_MSGID_SNS_STEP_EVENT = 1028;
-
-  SNS_PEDOMETER_MSGID_SNS_STEP_EVENT_CONFIG = 775;
-}
-
-// Events types from Pedometer Sensor
-message sns_step_event
-{
-  //an incrementing step count
-  required uint32 step_count = 1;
-}
-
-message sns_step_event_config
-{
-  //current step count
-  required uint32 step_count = 1;
-}
-
-
-// Stream events:
-//
-// The sns_step_event message is used to publish updated step count
-//
-// The sns_step_event_config message is used to publish current step count
-// to the client
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_pedometer_wrist.proto b/proprietary/vendor/etc/sensors/proto/sns_pedometer_wrist.proto
deleted file mode 100644
index 65a6348..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_pedometer_wrist.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// @file sns_pedometer_wrist.proto
-//
-// Defines message types for the Pedometer_wrist Sensor.
-//
-// Copyright (c) 2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Pedometer_wrist Sensor detects steps taken by the user
-//
-// The Pedometer_wrist Step event is generated when the user takes a step.
-// The event includes the latest step count accumulated since activation.
-// All clients to Pedometer_wrist get the same step event.
-// The timestamp of the event indicates the time of the latest detected step.
-
-// Pedometer_wrist Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "pedometer_wrist"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Pedometer_wrist Sensor
-enum sns_pedometer_wrist_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_PEDOMETER_WRIST_MSGID_SNS_PEDOMETER_STEP_EVENT = 1028;
-  //send to client immediatly to inform current step count
-  //msg body same as sns_step_event
-  SNS_PEDOMETER_WRIST_MSGID_SNS_PEDOMETER_STEP_EVENT_CONFIG = 775;
-}
-
-// Events types from Pedometer_wrist Sensor
-message sns_pedometer_step_event
-{
-  //an incrementing step count
-  required uint32 step_count = 1;
-}
-
-message sns_pedometer_step_event_config
-{
-  //current step count
-  required uint32 step_count = 1;
-}
-
-
-// Stream events:
-//
-// The sns_step_event message is used to publish updated step count
-//
-// Pedometer_wrist does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_oem_config.proto b/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_oem_config.proto
deleted file mode 100644
index ba581b4..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_oem_config.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-// @file sns_physical_sensor_oem_config.proto
-//
-// Defines config API message types for physical sensors.
-//
-// All physical Sensor drivers are required to use this API to support
-// self-test. SNS_PHYSICAL_SENSOR_TEST_TYPE_COM is a mandatory test type and must be
-// implemented in all physical Sensor drivers. Any new or device-specific
-// test type may be defined in the Sensor-specific API.
-//
-// Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-
-enum sns_physical_sensor_oem_config_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Test config request to a physical Sensor
-  SNS_PHYSICAL_SENSOR_OEM_CONFIG_MSGID_SNS_PHYSICAL_SENSOR_OEM_CONFIG = 2048;
-
-  // Test event message from a physical Sensor
-  SNS_PHYSICAL_SENSOR_OEM_CONFIG_MSGID_SNS_PHYSICAL_SENSOR_OEM_CONFIG_EVENT  = 2049;
-}
-
-// Supported test types for physical sensors
-enum sns_physical_sensor_oem_config_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // set tp info for als parameter settings.
-  SNS_PHYSICAL_SENSOR_CONFIG_TYPE_COLOR = 0;
-
-  // Sensor Hardware test.
-  SNS_PHYSICAL_SENSOR_CONFIG_LUX_SCALE = 1;
-
-  // Factory test used for Sensor calibration.
-  SNS_PHYSICAL_SENSOR_CONFIG_PS_THRESHOLD = 2;
-
-  // Communication bus test.
-  SNS_PHYSICAL_SENSOR_CONFIG_PS_FORCE_CALI = 3;
-
-  // Communication bus test.
-  SNS_PHYSICAL_SENSOR_CONFIG_BIAS = 4;
-
-  // Communication bus test.
-  SNS_PHYSICAL_SENSOR_CONFIG_BACKLIGHT = 5;
-
-  // Communication dc state notify.
-  SNS_PHYSICAL_SENSOR_CONFIG_DC_STATE = 6;
-
-  // Communication display rgb parse result notify.
-  SNS_PHYSICAL_SENSOR_CONFIG_BRIGHTNESS_PARSE_REULT_RGB = 7;
-
-  // Communication display refresh rate notify.
-  SNS_PHYSICAL_SENSOR_CONFIG_DISPLAY_FREQ = 8;
-
-  // Communication sensor channel calibration.
-  SNS_PHYSICAL_SENSOR_CONFIG_CHANNEL_CALI = 9;
- }
-
-// Physical Sensor oem configuration request
-message sns_physical_sensor_oem_config
-{
-  // Requested config type.
-  required sns_physical_sensor_oem_config_type config_type = 1;
-  optional uint32 color = 2;
-  optional float lux_scale = 3;
-  optional uint32  threshold_near = 4;
-  optional uint32  threshold_far = 5;
-  optional float offset_x = 6;
-  optional float offset_y = 7;
-  optional float offset_z = 8;
-  optional int32 backlight = 9;
-  optional int32 dc_state = 10;
-  optional float parsed_lux = 11;
-  optional float parsed_r = 12;
-  optional float parsed_g = 13;
-  optional float parsed_b = 14;
-  optional uint32 display_freq = 15;
-  optional float channel = 16;
-  optional float target = 17;
-  repeated float f =18 [(nanopb).max_count = 20];
-}
-
-// Physical Sensor test event
-message sns_physical_sensor_oem_config_event
-{
-  // Result if the test execution was successful:
-  // true for success
-  // false for failure
-  required bool config_result = 1 [default = true];
-
-  // test_type from sns_physical_sensor_oem_config that
-  // this event corresponds to
-  required sns_physical_sensor_oem_config_type config_type = 2 [default = SNS_PHYSICAL_SENSOR_CONFIG_TYPE_COLOR];
-
-  // Driver specific test data. This field can be used
-  // to pass additional information like failure codes, debug data, etc.
-  optional int32 poffset1 = 3;
-  optional int32 poffset2 = 4;
-  optional int32 color = 5;
-  optional int32 coefficient = 6;
-}
-
-// Self-test and streaming concurrency requirements:
-// 1. If the sensor is streaming and there is a client request to run
-//    self-test (any test type) then the driver:
-//      a. Pauses the stream
-//      b. Executes the self-test request to completion
-//      c. Resumes stream
-// 2. If the self-test is running and there is a client request to start
-//    a sensor stream then the driver:
-//      a. Rejects the stream request
-//      b. Continues executing the self-test request to completion
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_test.proto b/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_test.proto
deleted file mode 100644
index 70e7638..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_physical_sensor_test.proto
+++ /dev/null
@@ -1,80 +0,0 @@
-// @file sns_physical_sensor_test.proto
-//
-// Defines test API message types for physical sensors.
-//
-// All physical Sensor drivers are required to use this API to support
-// self-test. SNS_PHYSICAL_SENSOR_TEST_TYPE_COM is a mandatory test type and must be
-// implemented in all physical Sensor drivers. Any new or device-specific
-// test type may be defined in the Sensor-specific API.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-
-enum sns_physical_sensor_test_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Test config request to a physical Sensor
-  SNS_PHYSICAL_SENSOR_TEST_MSGID_SNS_PHYSICAL_SENSOR_TEST_CONFIG = 515;
-
-  // Test event message from a physical Sensor
-  SNS_PHYSICAL_SENSOR_TEST_MSGID_SNS_PHYSICAL_SENSOR_TEST_EVENT  = 1026;
-}
-
-// Supported test types for physical sensors
-enum sns_physical_sensor_test_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Software test.
-  SNS_PHYSICAL_SENSOR_TEST_TYPE_SW = 0;
-
-  // Sensor Hardware test.
-  SNS_PHYSICAL_SENSOR_TEST_TYPE_HW = 1;
-
-  // Factory test used for Sensor calibration.
-  SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY = 2;
-
-  // Communication bus test.
-  SNS_PHYSICAL_SENSOR_TEST_TYPE_COM = 3;
-}
-
-// Physical Sensor test configuration request
-message sns_physical_sensor_test_config
-{
-  // Requested test type.
-  required sns_physical_sensor_test_type test_type = 1;
-}
-
-// Physical Sensor test event
-message sns_physical_sensor_test_event
-{
-  // Result if the test execution was successful:
-  // true for success
-  // false for failure
-  required bool test_passed = 1 [default = true];
-
-  // test_type from sns_physical_sensor_test_config that
-  // this event corresponds to
-  required sns_physical_sensor_test_type test_type = 2 [default = SNS_PHYSICAL_SENSOR_TEST_TYPE_COM];
-
-  // Driver specific test data. This field can be used
-  // to pass additional information like failure codes, debug data, etc.
-  optional bytes test_data = 3;
-}
-
-// Self-test and streaming concurrency requirements:
-// 1. If the sensor is streaming and there is a client request to run
-//    self-test (any test type) then the driver:
-//      a. Pauses the stream
-//      b. Executes the self-test request to completion
-//      c. Resumes stream
-// 2. If the self-test is running and there is a client request to start
-//    a sensor stream then the driver:
-//      a. Rejects the stream request
-//      b. Continues executing the self-test request to completion
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_pose_6dof.proto b/proprietary/vendor/etc/sensors/proto/sns_pose_6dof.proto
deleted file mode 100644
index 3cb43e9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_pose_6dof.proto
+++ /dev/null
@@ -1,70 +0,0 @@
-// @file sns_pose_6dof.proto
-//
-// Defines the API for Pose Six Degrees of Freedom sensors.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A pose 6dof sensor events consists of a rotation expressed as a quaternion
-// and a translation expressed in SI units.  Pose of the device is defined as
-// the orientation of the device from a Earth Centered Earth Fixed frame and
-// the translation from an arbitrary point at subscription.
-//
-// ## Pose 6DOF sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "pose_6dof"
-//
-// ## Request Message: sns_std_sensor_config
-// sns_std_sensor_config::sample_rate is used to specify the sampling rate (Hz)
-// of the Pose 6DOF sensor. Sensor will generate data events at this rate.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the Pose 6DOF sensor will be populated in sns_std_sensor_event
-//
-// A Pose 6DOF sensor reports the orientation of the device relative
-// to the East-North-Up coordinates frame. It is obtained by
-// integration of accelerometer and gyroscope readings.
-// The East-North-Up coordinate system is defined as a direct
-// orthonormal basis where:
-//
-// - X points east and is tangential to the ground.
-// - Y points north and is tangential to the ground.
-// - Z points towards the sky and is perpendicular to the ground.
-//
-// The orientation is represented by the rotation necessary to align
-// the East-North-Up coordinates with the device's coordinates. That is,
-// applying the rotation to the world frame (X,Y,Z) would align them with
-// the device coordinates (x,y,z).
-//
-// The rotation can be seen as rotating the device by an angle theta around an
-// axis rot_axis to go from the reference (East-North-Up aligned) device
-// orientation to the current device orientation. The rotation is encoded
-// as the four unitless x, y, z, w components of a unit quaternion:
-//
-// sns_std_sensor_event::data[0] = x*sin(theta/2)
-// sns_std_sensor_event::data[1] = y*sin(theta/2)
-// sns_std_sensor_event::data[2] = z*sin(theta/2)
-// sns_std_sensor_event::data[3] = cos(theta/2)
-// sns_std_sensor_event::data[4] = Translation along x axis from an arbitrary origin.
-// sns_std_sensor_event::data[5] = Translation along y axis from an arbitrary origin.
-// sns_std_sensor_event::data[6] = Translation along z axis from an arbitrary origin.
-// sns_std_sensor_event::data[7] = Delta quaternion rotation x*sin(theta/2)
-// sns_std_sensor_event::data[8] = Delta quaternion rotation y*sin(theta/2)
-// sns_std_sensor_event::data[9] = Delta quaternion rotation z*sin(theta/2)
-// sns_std_sensor_event::data[10] = Delta quaternion rotation cos(theta/2)
-// sns_std_sensor_event::data[11] = Delta translation along x axis.
-// sns_std_sensor_event::data[12] = Delta translation along y axis.
-// sns_std_sensor_event::data[13] = Delta translation along z axis.
-// sns_std_sensor_event::data[14] = Sequence number; ascending sequentially from 0
-
-// Where:
-// - the x, y and z fields of rot_axis are the East-North-Up coordinates
-// of a unit length vector representing the rotation axis
-// - theta is the rotation angle
-//
-// sns_std_sensor_event::status specifies the reliability of the sample value
-// value is of type sns_std_sensor_sample_status. see sns_std_sensor.proto for
-// details.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ppg.proto b/proprietary/vendor/etc/sensors/proto/sns_ppg.proto
deleted file mode 100644
index d34368a..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ppg.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-// @file sns_ppg.proto
-//
-// Defines the API for PPG Sensors.
-//
-// Copyright (c) 2017-2018,2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-
-// Attribute requirements:
-// The PPG Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "ppg".
-// 2. SNS_STD_SENSOR_ATTRID_RATES attribute values in Hz.
-
-// Handling stream requests:
-// 1. The PPG Sensor handles the sns_std_sensor_config
-//    message request with msgid SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG
-//    for all stream enable/update requests.
-//    SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_STREAMING
-// 2. The PPG Sensor uses batching_period item in
-//    sns_std_request as the requested batching rate to determine
-//    hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The PPG Sensor publishes PPG data stream events
-//    using the sns_std_sensor_event message.
-// 2. Each stream event contains three output data fields
-//    data[0] => PPG ch1
-//    data[1] => PPG ch2
-//    data[2] => PPG ch3
-//    data[3] => PPG ch4
-//    data[4] => TOUCH_FLAG. 128 if onbody detect, 0 otherwise
-//    data[5] => WEAR_INDEX. 1 if wear loose, 0 otherwise
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The PPG Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_pressure.proto b/proprietary/vendor/etc/sensors/proto/sns_pressure.proto
deleted file mode 100644
index 97262cd..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_pressure.proto
+++ /dev/null
@@ -1,65 +0,0 @@
-// @file sns_pressure.proto
-//
-// Defines the API for Pressure Sensors.
-// All Pressure Sensor drivers are required to comply with this API.
-// Any new functionality for Pressure Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Pressure Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "pressure".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute values in hectoPascal/LSB unit.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in hectoPascal unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Pressure Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-// 2. If the physical sensor supports hardware FIFO then the Pressure
-//    Sensor uses batching_period item in sns_std_request as the requested
-//    batching rate to determine hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Pressure Sensor publishes atmospheric pressure data stream events
-//    using the sns_std_sensor_event message.
-// 2. Each stream event contains one output data field where data is
-//    factory calibrated and ordered as:
-//    data[0] = Pressure data in hPa (hectoPascal)
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Pressure Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Pressure Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The Pressure Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Pressure Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Pressure Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Pressure Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_proximity.proto b/proprietary/vendor/etc/sensors/proto/sns_proximity.proto
deleted file mode 100644
index 257725f..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_proximity.proto
+++ /dev/null
@@ -1,111 +0,0 @@
-// @file sns_proximity.proto
-//
-// Defines the API for Proximity Sensors.
-// All Proximity Sensor drivers are required to comply with this API.
-// Any new functionality for Proximity Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2019 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Proximity Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "proximity".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute is not applicable since this
-//    is an event sensor.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in cm unit (proximity distance).
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Proximity Sensor supports both streaming and on-change
-//    modes and the operating mode is configured in the Registry.
-// 2. The streaming Proximity Sensor handles the sns_std_sensor_config request
-//    for all stream enable/update requests.
-// 3. The on-change Proximity Sensor handles the
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG request for
-//    all on-change enable/update requests.
-// 4. In on-change mode the Sensor uses interrupt operation and reports
-//    samples only for NEAR/FAR transitions.
-
-// Message IDs for proximity Sensor
-enum sns_proximity_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_proximity_event
-  // Purpose: A non-recurring output data event from the proximity sensor to its client.
-  SNS_PROXIMITY_MSGID_SNS_PROXIMITY_EVENT  = 769;
-
-  // Uses message: sns_proximity_event_recurrent
-  // Purpose: A recurring output data event from the proximity sensor to its client.
-  SNS_PROXIMITY_MSGID_SNS_PROXIMITY_EVENT_RECURRENT  = 1031;
-}
-
-enum sns_proximity_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_PROXIMITY_EVENT_TYPE_FAR = 0;
-  SNS_PROXIMITY_EVENT_TYPE_NEAR  = 1;
-}
-
-// Events types from proximity Sensor
-message sns_proximity_event
-{
-  // Proximity NEAR/FAR output event
-  required sns_proximity_event_type proximity_event_type = 1 [default = SNS_PROXIMITY_EVENT_TYPE_FAR];
-
-  // Proimity sensor raw data
-  required uint32 raw_adc = 2;
-
-  // Proximity sensor sample status
-  required sns_std_sensor_sample_status status = 3 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-message sns_proximity_event_recurrent
-{
-  // Proximity NEAR/FAR output event
-  required sns_proximity_event_type proximity_event_type = 1 [default = SNS_PROXIMITY_EVENT_TYPE_FAR];
-
-  // Proimity sensor raw data
-  required uint32 raw_adc = 2;
-
-  // Proximity sensor sample status
-  required sns_std_sensor_sample_status status = 3 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-// Handling stream events:
-// 1. The Proximity Sensor publishes object proximity data stream events
-//    using sns_proximity_event message.
-// 2. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 3. The Proximity Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is a change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
-// Handling self-test requests:
-// 1. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Proximity Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for Proximity Sensor calibrates
-//    the sensor to detect an object (including light and dark colored)
-//    at 5cm distance from the physical sensor.
-// 3. The Proximity Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Proximity Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_psmd.proto b/proprietary/vendor/etc/sensors/proto/sns_psmd.proto
deleted file mode 100644
index b926657..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_psmd.proto
+++ /dev/null
@@ -1,59 +0,0 @@
-// @file sns_psmd.proto
-//
-// Defines the API for Persistent Stationary/Motion Detection Sensors.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// A persistent stationary/motion sensor reports once
-// - The device is moving/not still
-// - The device is detected to be still/stationary
-// The period of time to monitor for motion and stationarity should be greater
-// than 5 seconds, and less than 10 seconds.  After reporting, conceptually
-// the algorithm's state is reset, and detection begins again.
-//
-// Motion here refers to any mechanism in which the device is causes to be
-// moved in its inertial frame. eg: Picking up the device and walking with it
-// to a nearby room may trigger motion whereas keeping the device on a table
-// on a smooth train moving at constant velocity may not trigger motion.
-//
-// Stationarity here refers to absolute stationarity. eg: device on desk.
-//
-// ## Persistent Stationary/Motion Detect sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "psmd"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Message IDs for Persistent Stationary/Motion Sensor
-enum sns_psmd_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Configuration Request
-  SNS_PSMD_MSGID_SNS_PSMD_CONFIG = 512;
-
-  // Empty Event
-  // Indicates that the requested state has been detected
-  SNS_PSMD_MSGID_SNS_PSMD_EVENT = 768;
-}
-
-// Detected states supported by the PSM Detector
-enum sns_psmd_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_PSMD_TYPE_STATIONARY = 0;
-  SNS_PSMD_TYPE_MOTION = 1;
-}
-
-// Configuration Message
-// Used to specify the PSMD configuration
-message sns_psmd_config
-{
-  // Which detector type to enable
-  required sns_psmd_type type = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_registry.proto b/proprietary/vendor/etc/sensors/proto/sns_registry.proto
deleted file mode 100644
index 79acf7d..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_registry.proto
+++ /dev/null
@@ -1,86 +0,0 @@
-// @file sns_registry.proto
-//
-// Sensors Registry message definitions for internal and external clients
-//
-// Copyright (c) 2017,2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-
-// Registry Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "registry"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_SINGLE_OUTPUT
-
-// Registry Sensor message IDs:
-enum sns_registry_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_REGISTRY_MSGID_SNS_REGISTRY_READ_REQ = 512;
-  SNS_REGISTRY_MSGID_SNS_REGISTRY_WRITE_REQ = 513;
-  // The following event was mistakenly given an invalid message ID
-  SNS_REGISTRY_MSGID_SNS_REGISTRY_READ_EVENT = 514;
-  SNS_REGISTRY_MSGID_SNS_REGISTRY_WRITE_EVENT = 768;
-}
-
-message sns_registry_data
-{
-  message item
-  {
-    option (nanopb_msgopt).no_unions = true;
-
-    // Item name (i.e. Only item-specific name, sans group name)
-    required string name = 1;
-    optional fixed32 version = 2;
-
-    oneof data
-    {
-      sns_registry_data subgroup = 10;
-      string str = 11;
-      float flt = 12;
-      sfixed64 sint = 13;
-    }
-  }
-  repeated item items = 3;
-}
-
-// All read requests will be replied with a read event
-message sns_registry_read_req
-{
-  // Full name of the item or group to be read
-  required string name = 1;
-}
-
-message sns_registry_read_event
-{
-  // Full name of the group which was read
-  required string name = 1;
-
-  // If the requested registry group was not found, data is empty
-  required sns_registry_data data = 2;
-}
-
-// All write requests will be replied with a write event
-message sns_registry_write_req
-{
-  // Full name of the group to be written
-  required string name = 1;
-
-  required sns_registry_data data = 2;
-}
-
-// Registry write status
-enum sns_registry_write_status
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // The registry write was successful, and the data was stored on the FS
-  SNS_REGISTRY_WRITE_STATUS_SUCCESS = 0;
-  // An unspecified error has occurred; data may be lost
-  SNS_REGISTRY_WRITE_STATUS_ERROR_OTHER = 1;
-}
-
-message sns_registry_write_event
-{
-  required sns_registry_write_status status = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_resampler.proto b/proprietary/vendor/etc/sensors/proto/sns_resampler.proto
deleted file mode 100644
index cd69bd9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_resampler.proto
+++ /dev/null
@@ -1,90 +0,0 @@
-// @file sns_resampler.proto
-//
-// Defines standard message types for the Resampler
-//
-// Copyright (c) 2016-2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std.proto";
-import "sns_std_sensor.proto";
-import "sns_std_event_gated_sensor.proto";
-
-// Resampler Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "resampler"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_STREAMING
-
-// Sensor output event:
-// Resampler use sns_std_sensor_event for it's output event
-
-enum sns_resampler_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_RESAMPLER_MSGID_SNS_RESAMPLER_CONFIG = 512;
-  SNS_RESAMPLER_MSGID_SNS_RESAMPLER_CONFIG_EVENT = 776;
-}
-
-// Type of requested resampled rate
-enum sns_resampler_rate
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Requested resampled rate is fixed
-  SNS_RESAMPLER_RATE_FIXED = 0;
-
-  // Requested resampled rate is the minimum required
-  SNS_RESAMPLER_RATE_MINIMUM = 1;
-}
-
-// Resampler output quality
-enum sns_resampler_quality
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Resampler output is the same as input sensor data
-  SNS_RESAMPLER_QUALITY_CURRENT_SAMPLE = 0;
-
-  // Resampler output is filtered down from input sensor data
-  SNS_RESAMPLER_QUALITY_FILTERED = 1;
-
-  // Resampler output is interpolated and filtered down from input sensor data
-  SNS_RESAMPLER_QUALITY_INTERPOLATED_FILTERED = 2;
-
-  // Resampler output is interpolated down from input sensor data
-  SNS_RESAMPLER_QUALITY_INTERPOLATED = 3;
-}
-
-// Configuration Message
-// Used to either request for a new configuration of the Resampler Sensor or
-// alter an already existing configuration
-message sns_resampler_config
-{
-  // UID of the Sensor to be resampled
-  required sns_std_suid sensor_uid = 1;
-
-  // The requested resampled rate in Hz
-  required float resampled_rate = 2;
-
-  // The requested rate type as defined in sns_resampler_rate
-  required sns_resampler_rate rate_type = 3;
-
-  // Set to true to enable filtering, else false
-  required bool filter = 4;
-
-  // Set to true if sensor to be resampled is event gated
-  optional bool event_gated = 5;
-
-  // Number of axes of the sensor data
-  optional uint32 axis_cnt = 6;
-}
-
-// Config event to inform client sample quality
-// of all subsequent sns_std_sensor_event from resampler
-message sns_resampler_config_event
-{
-  // Quality of the resampled sensor data as defined in
-  // sns_resampler_quality
-  required sns_resampler_quality quality = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_rgb.proto b/proprietary/vendor/etc/sensors/proto/sns_rgb.proto
deleted file mode 100644
index 63a63ab..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_rgb.proto
+++ /dev/null
@@ -1,78 +0,0 @@
-// @file sns_rgb.proto
-//
-// Defines the API for RGB Sensors.
-// All RGB Sensor drivers are required to comply with this API.
-// Any new functionality for RGB Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The RGB Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "rgb".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute values in µW/cm2/LSB unit.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in µW/cm2 unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-
-// Handling stream requests:
-// 1. The RGB Sensor supports both streaming and on-change
-//    modes and the operating mode is configured in the Registry.
-// 2. The streaming RGB Sensor handles the sns_std_sensor_config
-//    request for all stream enable/update requests.
-// 3. The on-change RGB Sensor handles the
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG request for
-//    all stream enable/update requests.
-// 4. In on-change mode the Sensor uses interrupt operation and reports
-//    samples for only significant change in R/G/B/clear channel irradiance.
-//    Example: +/- 10% change.
-
-// Handling stream events:
-// 1. The RGB Sensor publishes color data in ambient light using the
-//    sns_std_sensor_event message.
-// 2. Each stream event contains six output data fields where data is
-//    factory calibrated and ordered as:
-//    data[0] = Red channel irradiance in µW/cm2
-//    data[1] = Green channel irradiance in µW/cm2
-//    data[2] = Blue channel irradiance in µW/cm2
-//    data[3] = Clear channel irradiance in µW/cm2
-//    data[4] = Color Temperature in Kelvin
-//    data[5] = raw clear channel ADC value
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The RGB Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The RGB Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The RGB Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The RGB Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for RGB Sensor calibrates
-//    the sensor such that it's output is comparable to a standard Chromemeter
-//    output in any lighting condition.
-// 3. The RGB Sensor could implement other test types.
-
-// Handling test events:
-// 1. The RGB Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution. 
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_rmd.proto b/proprietary/vendor/etc/sensors/proto/sns_rmd.proto
deleted file mode 100644
index 052aeee..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_rmd.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// @file sns_rmd.proto
-//
-// Defines message types for the Absolute Motion Detector (RMD) Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// RMD calculates motion and stationary states. RMD will initially start in an
-// unknown state, and later transition to motion or stationary.
-
-// RMD Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "rmd"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for RMD Sensor
-enum sns_rmd_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_RMD_MSGID_SNS_RMD_EVENT = 772;
-}
-
-enum sns_rmd_event_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_RMD_EVENT_TYPE_UNKNOWN          = 0;
-  SNS_RMD_EVENT_TYPE_STATIONARY       = 1;
-  SNS_RMD_EVENT_TYPE_MOTION           = 2;
-}
-
-message sns_rmd_event
-{
-  // RMD motion state
-  required sns_rmd_event_type state = 1 [default = SNS_RMD_EVENT_TYPE_UNKNOWN];
-}
-
-// Stream events:
-//
-// The sns_rmd_event message is used to publish updated state
-//
-// RMD does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_rotv.proto b/proprietary/vendor/etc/sensors/proto/sns_rotv.proto
deleted file mode 100644
index abe0ff8..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_rotv.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-// @file sns_rotv.proto
-//
-// Defines the API for Rotation Vector sensors.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "sns_std_sensor.proto";
-
-// A ROTV sensor reports the orientation of the device relative to the
-// East-North-Up coordinates frame. It is obtained by integration of
-// accelerometer, gyroscope, and magnetometer readings.
-//
-// ## ROTV sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "rotv"
-//
-// ## Request Message: sns_std_sensor_config
-// sns_std_sensor_config::sample_rate is used to specify the sampling rate (Hz)
-// of the ROTV sensor. Sensor will generate data events at this rate.
-//
-// ## Event Message: sns_std_sensor_event
-// Output of the ROTV sensor will be populated in sns_std_sensor_event
-//
-// The East-North-Up coordinate system is defined as a direct orthonormal
-// basis where:
-// - X points east and is tangential to the ground.
-// - Y points north and is tangential to the ground.
-// - Z points towards the sky and is perpendicular to the ground.
-//
-// The orientation is represented by the rotation necessary to align
-// the East-North-Up coordinates with the device's coordinates. That is,
-// applying the rotation to the world frame (X,Y,Z) would align them with
-// the device coordinates (x,y,z).
-//
-// The rotation can be seen as rotating the device by an angle theta around an
-// axis rot_axis to go from the reference device orientation to the current
-// device orientation. The rotation is encoded as the four unitless x, y, z, w
-// components of a unit quaternion:
-// sns_std_sensor_event::data[0] = rot_axis.x*sin(theta/2)
-// sns_std_sensor_event::data[1] = rot_axis.y*sin(theta/2)
-// sns_std_sensor_event::data[2] = rot_axis.z*sin(theta/2)
-// sns_std_sensor_event::data[3] = cos(theta/2)
-//
-// Where:
-// - the x, y and z fields of rot_axis are the East-North-Up coordinates
-// of a unit length vector representing the rotation axis
-// - theta is the rotation angle
-//
-// sns_std_sensor_event::status specifies the reliability of the sample value
-// value is of type sns_std_sensor_sample_status. see sns_std_sensor.proto for
-// details.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_sar.proto b/proprietary/vendor/etc/sensors/proto/sns_sar.proto
deleted file mode 100644
index c832b4c..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_sar.proto
+++ /dev/null
@@ -1,117 +0,0 @@
-// @file sns_sar.proto
-//
-// Defines the API for Specific Absorption Rate (SAR) Sensors.
-// SAR sensors typically detect human object proximity using change in capacitance
-// levels of copper touch pads/buttons.
-// All SAR Sensor drivers are required to comply with this API.
-// Any new functionality for SAR Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2018,2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The SAR Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "sar".
-//    Each SAR sensor (example individual capacitive button) shall be published
-//    as an independent sensor with a unique Sensor UID.
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute is not applicable since this
-//    is an event sensor.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in cm unit (proximity distance).
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream and on-change requests:
-// 1. The SAR sensor can support both streaming and on-change
-//    modes, and the operating mode is configured in the Registry.
-// 2. In streaming mode, the SAR sensor handles the sns_std_sensor_config
-//    client requests, for all stream enable/update request types. 
-// 3. In on-change mode, the SAR sensor handles the 
-//    SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG client requests,
-//    for all on-change enable/update request types.
-//    In on-change mode, the SAR sensor reports samples only for
-//    NEAR/FAR transitions triggered by the detection of an object 
-//    (typically human) in proximity to the SAR sensor. 
-//    Also for this mode, the SAR sensor publishes an 
-//    initial data event for each new, on-change client request.
-
-// Message IDs for SAR Sensor
-enum sns_sar_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_sar_event
-  // Purpose: A non-recurrent output data event from the SAR sensor to its client.
-  SNS_SAR_MSGID_SNS_SAR_EVENT  = 769;
-  
-  // Uses message: sns_sar_event_recurrent
-  // Purpose: A recurring output data event from the SAR sensor to its client.
-  SNS_SAR_MSGID_SNS_SAR_EVENT_RECURRENT  = 1031;
-}
-
-enum sns_sar_event_type {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_SAR_EVENT_TYPE_FAR = 0;
-  SNS_SAR_EVENT_TYPE_NEAR  = 1;
-}
-
-// Events types from SAR Sensor
-message sns_sar_event
-{
-  // SAR NEAR/FAR output event
-  required sns_sar_event_type sar_event_type = 1 [default = SNS_SAR_EVENT_TYPE_FAR];
-
-  // SAR sensor raw data.
-  // Format of this data is driver specific.
-  optional bytes additional_sar_data = 2;
-
-  // SAR sensor sample status
-  required sns_std_sensor_sample_status status = 3 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-message sns_sar_event_recurrent
-{
-  // SAR NEAR/FAR output event
-  required sns_sar_event_type sar_event_type = 1 [default = SNS_SAR_EVENT_TYPE_FAR];
-
-  // SAR sensor raw data.
-  // Format of this data is driver specific.
-  optional bytes additional_sar_data = 2;
-
-  // SAR sensor sample status
-  required sns_std_sensor_sample_status status = 3 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-// Handling stream events:
-// 1. The SAR Sensor publishes human object proximity data events using sns_sar_event message.
-// 2. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 3. The SAR Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-
-// Handling self-test requests:
-// 1. The SAR Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The SAR Sensor may implement SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The SAR Sensor could implement other test types.
-
-// Handling test events:
-// 1. The SAR Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_sensor_temperature.proto b/proprietary/vendor/etc/sensors/proto/sns_sensor_temperature.proto
deleted file mode 100644
index e614211..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_sensor_temperature.proto
+++ /dev/null
@@ -1,66 +0,0 @@
-// @file sns_sensor_temperature.proto
-//
-// Defines the API for physical Sensor Temperature Sensors.
-// All Sensor Temperature Sensor drivers are required to comply with this API.
-// Any new functionality for Sensor Temperature Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Sensor Temperature Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "sensor_temperature".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in degrees Celsius/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in degrees Celsius unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Sensor Temperature Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-// 2. If the physical sensor supports hardware FIFO then the Sensor Temperature
-//    Sensor uses batching_period item in sns_std_request as the requested
-//    batching rate to determine hardware FIFO watermark.
-
-// Handling stream events:
-// 1. The Sensor Temperature Sensor publishes physical sensor temperature data
-//    stream events using the sns_std_sensor_event message.
-// 2. Each stream event contains one output data field where data is
-//    factory calibrated and ordered as:
-//    data[0] = physical Sensor Temperature data in degrees Celsius
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Sensor Temperature Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Sensor Temperature Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-
-// Handling self-test requests:
-// 1. The Sensor Temperature Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Sensor Temperature Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Sensor Temperature Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Sensor Temperature Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_sig_motion.proto b/proprietary/vendor/etc/sensors/proto/sns_sig_motion.proto
deleted file mode 100644
index d055d99..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_sig_motion.proto
+++ /dev/null
@@ -1,32 +0,0 @@
-// @file sns_sig_motion.proto
-//
-// Defines the API for Significant Motion Detection Sensors.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// A significant motion sensor reports once if "significant motion"
-// is detected.
-//
-// ## Significant Motion sensor attributes:
-// SNS_STD_SENSOR_ATTRID_TYPE is "sig_motion"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_SINGLE_OUTPUT
-//
-// ## Request Message: SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG
-// No configuration is available for this sensor.
-//
-// ## Event Message: SNS_SIG_MOTION_MSGID_SNS_SIG_MOTION_EVENT
-// Reported upon new detection of significant motion.
-
-// Message IDs for Significant Motion Detect Sensor
-enum sns_sig_motion_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Empty Message
-  SNS_SIG_MOTION_MSGID_SNS_SIG_MOTION_EVENT = 772;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_std.proto b/proprietary/vendor/etc/sensors/proto/sns_std.proto
deleted file mode 100644
index b7a0630..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_std.proto
+++ /dev/null
@@ -1,145 +0,0 @@
-// @file sns_std.proto
-//
-// Defines standard messages used across multiple Sensor API definitions
-//
-// Copyright (c) 2016-2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import public "sns_std_type.proto";
-
-// Framework-defined message IDs:
-enum sns_std_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  // Query a Sensor for all attributes
-  // @event sns_std_error_event
-  SNS_STD_MSGID_SNS_STD_ATTR_REQ = 1;
-
-  // Flush a Sensor.
-  // When a sensor receives a flush request it publishes any unpublished
-  // samples. The sensor always  publishes a SNS_STD_MSGID_SNS_STD_FLUSH_EVENT
-  // event to indicate completion of a flush request.
-  // All Sensors handle this flush request message. See special case handling below
-  // Empty Message
-  // @event sns_pb_flush_event
-  SNS_STD_MSGID_SNS_STD_FLUSH_REQ = 2;
-
-  // NOTE: 10 - 20 Are reserved for Client Manager
-  // NOTE: 120-127 Are reserved
-
-  // All published attributes for a Sensor
-  SNS_STD_MSGID_SNS_STD_ATTR_EVENT = 128;
-
-  // Indicates no further events will be generated in response to a flush req.
-  // Empty Message
-  SNS_STD_MSGID_SNS_STD_FLUSH_EVENT = 129;
-
-  // Indicates an error has occurred
-  SNS_STD_MSGID_SNS_STD_ERROR_EVENT = 130;
-
-  // NOTE: 250-255 Are reserved
-}
-// Special case handling for flush request
-// 1. No prior instance has been created, and a flush request is received, i.e. flush request is sent before an enable req
-//    Unexpected sequence, driver can ignore the flush request, and set_client_request returns  NULL
-// 2. When enable request is sent and while that is still ongoing ( phy cfg event not published yet) and a flush request is received, expected sequence below:
-//    a) sensor driver gets sns_std_sensor_config
-//    b) sensor driver gets sns_std_flush_req
-//    c) sensor driver sends sns_std_sensor_physical_config_event
-//    d) sensor driver sends sns_std_flush_event
-// 3. When a previous flush request is still ongoing and another flush request comes
-//    a) sensor driver receives  sns_std_flush_req
-//    b) sensor driver receives another sns_std_flush_req while first flush request is being handled, but no flush event is sent yet
-//    c) sensor driver can ignore the 2nd flush request
-//    d) sensor driver finishes processing the first flush request and sends sns_std_flush_event
-// #1 and # 3 applies to algorithm as well.
-
-
-// Base message payload, from which all other Request payloads must extend
-// The message will be delivered decoded within the Sensor API
-message sns_std_request {
-  message batch_spec {
-    // Logically a timer will be registered for this many microseconds.
-    // All events generated since the last timer expiration will be saved
-    // until the next timer has fired.  This period is interpreted as a maximum
-    // period specified by the client; events may be delivered to client at a
-    // faster rate (smaller batch period).
-    // A batch period of 0 indicates that no batching shall occur.
-    required uint32 batch_period = 1;
-
-    // Sensor supporting Data Acquisition Engine shall support flush_period.
-    // Sensor shall not drop data that is more recent than flush_period.
-    // Sensor may drop data that is older than the flush_period.
-    // Effective flush period may be smaller due to system constraints,
-    // or larger in the case of a concurrent client with a larger value.
-    // flush_period, if set, should be greater than or equal to batch_period.
-    // flush_period value defaults to UINT32_MAX; units in microseconds.
-    // If batch_period > 0 and flush period not specified,
-    // then flush_period = batch_period.
-    optional uint32 flush_period = 2;
-
-    // If flush_only = true, the sensor should only send data to the client
-    // on receiving a flush request or if the sensor cannot accumulate flush
-    // period worth of data.
-    optional bool flush_only = 3 [default = false];
-
-    // If max_batch = true for all requests, the sensor should operate at
-    // maximum batching capacity. If a request has both max_batch = true
-    // and flush_only = true, flush_only takes precedence.
-    optional bool max_batch = 4 [default = false];
-  }
-  // Batching is disabled by default
-  optional batch_spec batching = 1;
-
-  // Dynamic length payload, containing the actual data/configuration request
-  // This payload will need to be decoded separately, using the Sensor-specific
-  // header file. If the request does not contain any message body then this
-  // field is not present.
-  optional bytes payload = 2;
-
-  // Set to true if a client intends to be a passive client. Else it is an
-  // active client request. Absence of this field shall be treated as an active
-  // request.
-  // If all requests to the sensor are passive then it shall be in off
-  // state and stop streaming.
-  // If the sensor has at least one active request then it shall be enabled
-  // and configured according to all active and passive requests.
-  // When all active clients are flush_only then passive clients are also treated
-  // as flush_only.
-  // When all active clients are event gated then passive clients are also treated
-  // as event gated.
-  // delivery_type field in passive requests shall be configured as
-  // SNS_CLIENT_DELIVERY_NO_WAKEUP.
-  // Actively enabling one sensor shall not lead to enabling of another
-  // sensor having only passive requests. For example: enabling gyro shall not
-  // lead to enabling of sensor_temperature, and vice versa.
-  optional bool is_passive = 3 [default = false];
-
-}
-
-// Query a Sensor for its list of attributes
-message sns_std_attr_req {
-  // Register for updates when the attributes of a Sensor change
-  // This option is not presently supported
-  optional bool register_updates = 2;
-}
-
-// Contains all Sensor attributes; sent in response to an sns_std_attr_req,
-// or upon an attribute change to a registered Sensor
-message sns_std_attr_event {
-  repeated sns_std_attr attributes = 1;
-}
-
-// An Error Event generated by a Sensor/Instance or the Framework
-message sns_std_error_event {
-  // SNS_STD_ERROR_NOT_AVAILABLE - Transitory error in the Sensor; some data
-  //    may have been lost or dropped, but streaming should resume.
-  // SNS_STD_ERROR_INVALID_STATE - Catastrophic error in the Sensor; do not
-  //    expect any further data.  Client may try sending enable-request again.
-  // SNS_STD_ERROR_NOT_SUPPORTED - Sensor received an unsupported request; or a
-  //    supported request at an unexpected time. Client may not expect any
-  //    further data and may try sending valid request.
-  required sns_std_error error = 1;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_std_event_gated_sensor.proto b/proprietary/vendor/etc/sensors/proto/sns_std_event_gated_sensor.proto
deleted file mode 100644
index 7e49cb9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_std_event_gated_sensor.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// @file sns_std_event_gated_sensor.proto
-//
-// Defines standard message types for Sensors with output streams that can be
-// gated on an event from another Sensor.
-// Example: "accel" Sensor can be gated by motion detect event published by
-//          the "motion_detect" Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-enum sns_std_event_gated_sensor_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Message ID to send a gated request to a Sensor.
-  // Note that the client is responsible to send separate
-  // requests to the Sensor that provides the gating event.
-  SNS_STD_EVENT_GATED_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG = 518;
-
-  // An event gated Sensors uses this event message ID to indicate to it's
-  // clients that the gated stream is converted to a non-gated stream.
-  // This typically happens when the gating event occurs.
-  // Example: When "accel" is gated on "motion_detect" and if the
-  //          motion detect interrupt fires then the "accel" Sensor publishes
-  //          this event to it's clients before the accel data stream starts.
-  SNS_STD_EVENT_GATED_SENSOR_MSGID_GATED_REQ_CONVERTED_TO_NON_GATED = 772;
-}
-
-// Request and Event messages:
-// 1. An enable request to an event gated sensor uses message
-//    sns_std_sensor_config with message ID
-//    SNS_STD_EVENT_GATED_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG.
-// 2. An event gated sensor publishes an output event to it's clients when
-//    the gated request is converted to a non-gated request. It uses event
-//    message ID SNS_STD_EVENT_GATED_SENSOR_MSGID_GATED_REQ_CONVERTED_TO_NON_GATED
-//    with no message payload.
-// 3. An output data event from an event gated sensor uses message
-//    sns_std_sensor_event. See sns_std_sensor.proto and sensor-specific
-//    proto file for details.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_std_sensor.proto b/proprietary/vendor/etc/sensors/proto/sns_std_sensor.proto
deleted file mode 100644
index 771354e..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_std_sensor.proto
+++ /dev/null
@@ -1,412 +0,0 @@
-// @file sns_std_sensor.proto
-//
-// Defines standard message types for all Sensors. All physical Sensors are
-// required to implement this API as is or derive from it. For all other
-// Sensors, these messages are highly recommended. That being said, Sensor
-// developers may choose to define Sensor-specific message API for any
-// new/Sensor-specific functionality.
-//
-// Copyright (c) 2016-2021 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-
-enum sns_std_sensor_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Uses message: sns_std_sensor_config
-  // Purpose:
-  //   1. A stream request from a client to a sensor.
-  //   2. A config/ack event from a sensor to the client.
-  SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_CONFIG = 513;
-
-  // Does not use any message body.
-  // Purpose:
-  //   1. An enable request from a client to an on-change sensor.
-  //      Subsequent request from same client will be treated as NOP
-  //   2. A config/ack event from an on-change sensor to the client.
-  // Requirements for on-change sensors are listed in a section below.
-  SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG  = 514;
-
-  // Uses message: sns_std_sensor_physical_config_event
-  // Purpose: A configuration event from a Physical Sensor (streaming and event)
-  //          to the client.
-  // Requirements for physical configuration events are listed in a section
-  // below.
-  SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_PHYSICAL_CONFIG_EVENT = 768;
-
-  // Uses message: sns_std_sensor_event
-  // Purpose: A data event from a Sensor.
-  SNS_STD_SENSOR_MSGID_SNS_STD_SENSOR_EVENT = 1025;
-}
-
-// Status for each sensor sample
-enum sns_std_sensor_sample_status
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Sample is unreliable.
-  SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE = 0;
-
-  // Sample is low accuracy.
-  SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_LOW = 1;
-
-  // Sample is medium accuracy.
-  SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_MEDIUM = 2;
-
-  // Sample is high accuracy.
-  SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH = 3;
-}
-
-// Attribute IDs available for use by Sensors
-// Some are marked as REQUIRED, and must be published by every Sensor.  Others
-// are OPTIONAL, and may be only necessary for physical Sensors.
-//
-// Each Sensor may define their own custom attributes, using the form:
-// <proto_name>_attr_id.  Attribute IDs have the following reserved ranges:
-// 0-511 : Held for sns_std_sensor_attr_id
-// 512-1023 : Reserved for internal QTI use
-// 1024-1535 : Available for use by Sensor developers
-enum sns_std_sensor_attr_id
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // REQUIRED
-  // String
-  // Human-readable sensor name
-  SNS_STD_SENSOR_ATTRID_NAME = 0;
-
-  // REQUIRED
-  // String
-  // Human-readable vendor name
-  SNS_STD_SENSOR_ATTRID_VENDOR = 1;
-
-  // REQUIRED
-  // String
-  // Data Type used by this Sensor
-  SNS_STD_SENSOR_ATTRID_TYPE = 2;
-
-  // REQUIRED
-  // Boolean
-  // Whether this Sensor is available for clients
-  SNS_STD_SENSOR_ATTRID_AVAILABLE = 3;
-
-  // REQUIRED
-  // Integer 64-bit version number represented as major[31:16].minor[15:8].revision[7:0],  [63:32] be 0
-  // Example in hexadecimal: major:0x0002 minor:0x00 revision:0x36  #define DRIVER_VERSION 0x00020036
-  // Sensor version
-  SNS_STD_SENSOR_ATTRID_VERSION = 4;
-
-  // REQUIRED
-  // [String]
-  // .proto files specifying the incoming request and outgoing event messages
-  SNS_STD_SENSOR_ATTRID_API = 5;
-
-  // OPTIONAL
-  // [Float]
-  // Supported sample rates in Hz
-  SNS_STD_SENSOR_ATTRID_RATES = 6;
-
-  // OPTIONAL
-  // [Float]
-  // Supported resolutions
-  SNS_STD_SENSOR_ATTRID_RESOLUTIONS = 7;
-
-  // OPTIONAL
-  // Integer
-  // Supported FIFO depth in number of samples
-  SNS_STD_SENSOR_ATTRID_FIFO_SIZE = 8;
-
-  // OPTIONAL
-  // [Integer]
-  // Active currents in uA for all sns_attr_op_modes. Length of the array
-  // of active currents must match the length of the array of operation modes.
-  SNS_STD_SENSOR_ATTRID_ACTIVE_CURRENT = 9;
-
-  // OPTIONAL
-  // Integer
-  // Inactive current in uA
-  SNS_STD_SENSOR_ATTRID_SLEEP_CURRENT = 10;
-
-  // OPTIONAL
-  // [{float,float}]
-  // Supported operating ranges
-  SNS_STD_SENSOR_ATTRID_RANGES = 11;
-
-  // OPTIONAL
-  // String
-  // Operating Modes ("LPM", "HIGH_PERF", "NORMAL", "OFF")
-  SNS_STD_SENSOR_ATTRID_OP_MODES = 12;
-
-  // OPTIONAL
-  // Boolean
-  // Whether the Sensor supports Data Ready Interrupt (DRI) or IBI
-  // (In Band Interrupt).
-  SNS_STD_SENSOR_ATTRID_DRI = 13;
-
-  // OPTIONAL
-  // Boolean
-  // Whether a Sensor support synchronized streaming.
-  SNS_STD_SENSOR_ATTRID_STREAM_SYNC = 14;
-
-  // OPTIONAL
-  // Integer
-  // Encoded message size of the data event generated most often by the Sensor
-  SNS_STD_SENSOR_ATTRID_EVENT_SIZE = 15;
-
-  // REQUIRED
-  // Integer: sns_std_sensor_stream_type
-  // Streaming Type
-  SNS_STD_SENSOR_ATTRID_STREAM_TYPE = 16;
-
-  // OPTIONAL
-  // Boolean
-  // Whether this Sensor is dynamic (connected/disconnected at runtime)
-  SNS_STD_SENSOR_ATTRID_DYNAMIC = 17;
-
-  // OPTIONAL
-  // Integer
-  // When multiple Sensors of the same hardware exist, this attribute differentiates.
-  SNS_STD_SENSOR_ATTRID_HW_ID = 18;
-
-  // OPTIONAL
-  // Integer: sns_std_sensor_rigid_body_type
-  // The rigid body on which the Sensor is placed.
-  SNS_STD_SENSOR_ATTRID_RIGID_BODY = 19;
-
-  // OPTIONAL
-  // float[12]
-  // Location and orientation of sensor element in the device frame.
-  SNS_STD_SENSOR_ATTRID_PLACEMENT = 20;
-
-  // OPTIONAL
-  // Boolean
-  // Boolean: True for a physical sensor
-  SNS_STD_SENSOR_ATTRID_PHYSICAL_SENSOR = 21;
-
-  // OPTIONAL
-  // [Integer]
-  // List of supported self-test types from sns_physical_sensor_test_type.
-  SNS_STD_SENSOR_ATTRID_PHYSICAL_SENSOR_TESTS = 22;
-
-  // OPTIONAL
-  // Float
-  // Sensors chosen resolution in it's engineering units.
-  SNS_STD_SENSOR_ATTRID_SELECTED_RESOLUTION = 23;
-
-  // OPTIONAL
-  // float[2]
-  // Sensors chosen {min, max} range in it's engineering units.
-  SNS_STD_SENSOR_ATTRID_SELECTED_RANGE = 24;
-
-  // OPTIONAL
-  // [float]
-  // List of additional sample rates for low latency clients in Hz.
-  // These are additional rates for low latency clients extended from list
-  // of rates published in attribute SNS_STD_SENSOR_ATTRID_RATES.
-  // This is supported for internal clients only. External clients shall not use this API.
-  SNS_STD_SENSOR_ATTRID_ADDITIONAL_LOW_LATENCY_RATES = 25;
-
-  // OPTIONAL
-  // Boolean
-  // Boolean: True if the sensor supports passive request, False otherwise.
-  // If this attribute is not supported, then the sensor does not support passive requests.
-  // Sensors that do not support passive requests, will service all requests as active requests.
-  SNS_STD_SENSOR_ATTRID_PASSIVE_REQUEST = 26;
-
-  // OPTIONAL
-  // float
-  // direct channel supported max sample rate in Hz
-  SNS_STD_SENSOR_ATTRID_DIRECT_CHANNEL_MAX_SAMPLE_RATE = 27;
-
-  // OPTIONAL
-  // float
-  // direct channel supported max report rate in Hz
-  SNS_STD_SENSOR_ATTRID_DIRECT_CHANNEL_MAX_REPORT_RATE = 28;
-}
-
-// Sensor stream configuration request
-// or configuration change message
-message sns_std_sensor_config
-{
-  // Sample rate in Hz.
-  required float sample_rate = 1;
-}
-
-// Sensor data event
-message sns_std_sensor_event
-{
-  // Output data field for all Sensor.
-  repeated float data = 1;
-
-  // Event sample status.
-  required sns_std_sensor_sample_status status = 2 [default = SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE];
-}
-
-// Stream types
-enum sns_std_sensor_stream_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Used for Sensors that report data periodically.
-  // Example: accel, gyro, mag
-  SNS_STD_SENSOR_STREAM_TYPE_STREAMING = 0;
-
-  // Used for Sensors that report data only on change in value.
-  // Example: proximity, hall
-  SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE = 1;
-
-  // Used for Sensors that have a single data event in reponse to a request.
-  // Example: SUID, motion detect
-  SNS_STD_SENSOR_STREAM_TYPE_SINGLE_OUTPUT = 2;
-}
-
-// Rigid body types
-enum sns_std_sensor_rigid_body_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Used for a Sensor mounted on the same rigid body as the display.
-  SNS_STD_SENSOR_RIGID_BODY_TYPE_DISPLAY = 0;
-
-  // Used for a Sensor mounted on the same rigid body as a keyboard.
-  SNS_STD_SENSOR_RIGID_BODY_TYPE_KEYBOARD = 1;
-
-  // Used for a Sensor that is mounted on an external device.
-  SNS_STD_SENSOR_RIGID_BODY_TYPE_EXTERNAL = 2;
-}
-
-// Sensor stream configuration event
-message sns_std_sensor_config_event
-{
-  // Current sample rate in Hz
-   required float sample_rate = 1;
-}
-
-// Physical sensor stream configuration. This message reflects the current
-// configuration of the physical sensor.
-message sns_std_sensor_physical_config_event
-{
-  // Current sample rate in Hz for streaming sensors only, 0 if sensor is disabled
-  // ( ex: when event gated or in passive mode and not streaming )
-  // Note: if stream will be synchronized via S4S or I3C, this is the sample
-  // rate after synchronization is complete.
-  optional float sample_rate = 1;
-
-  // Current hardware water mark setting. 1 if FIFO not in use.
-  optional uint32 water_mark = 2;
-
-  // Sensor sample value min and max range
-  repeated float range = 3 [(nanopb).max_count = 2];
-
-  // Sensor sample value Resolution
-  optional float resolution = 4;
-
-  // Sensor operation mode
-  // If all requests to the sensor are passive then it shall use
-  // operating_mode = "OFF"
-  optional string operation_mode = 5;
-
-  // Sensor active current in uA
-  optional uint32 active_current = 6;
-
-  // Sensor streaming is synchronized via methods like S4S and/or I3C.
-  // Note: if the stream is not yet synchronized, this field should be
-  // false, and an additional config event sent with stream_is_synchronous
-  // set to true once the clocks have been synchronized.
-  optional bool stream_is_synchronous = 7;
-
-  // Sensor has enabled Data Ready Interrupt (DRI) or In Band Interrupt (IBI)
-  optional bool dri_enabled = 8;
-
-  // Current DAE water mark setting. 0 if non-DAE sensor.
-  optional uint32 DAE_watermark = 9;
-
-  // The sync anchor is only valid for synchronized sensors.
-  // If used, "stream_is_synchronous" should eventually be set to true when the clocks are synchronized.
-  // It is a timestamp of a future (or past) sns_std_sensor_event.
-  // This may be used by clients to determine the synchronized timeline before it is synchronized.
-  optional uint64 sync_ts_anchor = 10;
-}
-
-// Attribute requirements:
-// The Physical Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_AVAILABLE attribute value (bool) as true when it's dependencies
-//    are met and the hardware is present and responsive.
-// 2. SNS_STD_SENSOR_ATTRID_NAME attribute value (string) as the name of the sensor model.
-// 3. SNS_STD_SENSOR_ATTRID_VENDOR attribute value (string) as the name of the sensor vendor.
-// 4. SNS_STD_SENSOR_ATTRID_VERSION attribute value (decimal) as the version of the driver.
-// 5. SNS_STD_SENSOR_ATTRID_RATES attribute as a float array of supported sample rates in Hz
-//    for streaming sensors. On-change sensors publish the highest rate of value change.
-// 6. SNS_STD_SENSOR_ATTRID_FIFO_SIZE attribute value (decimal) as the maximum FIFO depth in
-//    number of sensor samples available to it when enabled standalone.
-//    The value can be zero if FIFO is not supported.
-// 7. SNS_STD_SENSOR_ATTRID_ACTIVE_CURRENT attribute as an integer  array representing active
-//    currents in uA corresponding to the sns_attr_op_modes attribute.
-// 8. SNS_STD_SENSOR_ATTRID_SLEEP_CURRENT attribute value (float) as the current in uA when
-//    the sensor is in power down mode.
-// 9. SNS_STD_SENSOR_ATTRID_OP_MODES attribute value as an array of string values
-//     representing different hardware operating modes.
-// 10. SNS_STD_SENSOR_ATTRID_DRI attribute value (bool) as true when it supports
-//     interrupt based streaming else false when polling.
-//     The source of data ready interrupt (DRI) could be completion of measurement
-//     cycle, FIFO water mark (if sns_attr_fifo_size value is greater than 0),
-//     threshold, etc.
-//     If the sensor is capable of streaming in both polling and DRI modes then
-//     it publishes separate Sensors for each mode such that the one with DRI
-//     publishes SNS_STD_SENSOR_ATTRID_DRI value as true and the one with polling
-//     publishes SNS_STD_SENSOR_ATTRID_DRI as false.
-// 11. SNS_STD_SENSOR_ATTRID_STREAM_SYNC attribute value (bool) as true when it
-//     it supports a synchronous streaming mechanism like S4S and/or I3C.
-// 12. SNS_STD_SENSOR_ATTRID_EVENT_SIZE attribute value (decimal) as number of bytes in the
-//     output data event for the Sensor.
-// 13. SNS_STD_SENSOR_ATTRID_STREAM_TYPE attribute value (sns_std_sensor_stream_type) as the
-//     supported stream type.
-// 14. SNS_STD_SENSOR_ATTRID_DYNAMIC attribute value (bool) to indicate whether the sensor
-//     can be added at runtime.
-// 15. SNS_STD_SENSOR_ATTRID_HW_ID attribute value (string) to uniquely identify multiple
-//     sensor hardware of the same model on a platform.
-// 16. SNS_STD_SENSOR_ATTRID_RIGID_BODY attribute value (sns_std_sensor_rigid_body_type) as the rigid
-//     body on which the sensor is mounted.
-// 17. SNS_STD_SENSOR_ATTRID_PLACEMENT attribute value as the location and orientation of
-//     the sensor hardware.
-// 18. SNS_STD_SENSOR_ATTRID_PHYSICAL_SENSOR attribute value (bool) to indicate if the sensor is
-//     a physical sensor
-// 19. SNS_STD_SENSOR_ATTRID_PHYSICAL_SENSOR_TESTS attribute value as array of supported
-//     sns_physical_sensor_test_type test types.
-// 20. SNS_STD_SENSOR_ATTRID_SELECTED_RESOLUTION attribute value chosen from the
-//     SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute array.
-// 21. SNS_STD_SENSOR_ATTRID_SELECTED_RANGE attribute value chosen from the
-//     SNS_STD_SENSOR_ATTRID_RANGES array.
-// 22. SNS_STD_SENSOR_ATTRID_ADDITIONAL_LOW_LATENCY_RATES attribute as a float array of supported
-//     sample rates in Hz additional to rates in SNS_STD_SENSOR_ATTRID_RATES, this is only for low
-//     latency clients like direct report mode.
-// See sensor specific .proto files for sensor specific attribute information.
-
-// Recommendation for device drivers to select configuration:
-// 1. Choose fastest sample_rate among all client requests.
-// 2. Choose fastest batch rate (using batch_period) among all client requests. For streaming clients,
-//    treat batch rate equal to requested sample rate for that request.
-// 3. If HW FIFO is supported then:
-//     a. If all requests are max_batch then the driver configures highest FIFO watermark.
-//        If DAE is supported, the DAE watermark should be INT_MAX.
-//     b. Else FIFO watermark is determined based on sample_rate from #1 and batch rate from #2.
-
-// Requirements for on-change sensors:
-// 1. Timestamp in data events. When a second (or subsequent) client request
-//    is processed, by a given sensor, an initial data event must be generated.
-//    The timestamp in this event must be equal to the timestamp of the most
-//    recent state transition. The timestamp of the last occurring state
-//    transition can be latched (e.g. in a state structure), per on-change
-//    sensor SUID.
-
-// Requirements for physical configuration events:
-// 1. Timestamp in physical configuration events. When a second (or subsequent)
-//    client request is processed, by a given sensor, a physical configuration
-//    event must be generated. The timestamp, in the physical configuration
-//    event, must be equal to the timestamp of the most recent physical
-//    configuration change. The timestamp of the last occurring physical
-//    configuration change can be latched (e.g. in a state structure).
diff --git a/proprietary/vendor/etc/sensors/proto/sns_std_type.proto b/proprietary/vendor/etc/sensors/proto/sns_std_type.proto
deleted file mode 100644
index 0438235..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_std_type.proto
+++ /dev/null
@@ -1,79 +0,0 @@
-// @file sns_std_type.proto
-//
-// Defines standard data types used across multiple Sensor API definitions
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-
-// Represents an unique Sensor
-message sns_std_suid {
-  required fixed64 suid_low = 1;
-  required fixed64 suid_high = 2;
-}
-
-// Represents an attribute value
-// Attribute values may be a single value, array of simple values, or
-// an array of complex tuples
-message sns_std_attr_value {
-  // "data" submessage required to support recursion
-  message data {
-    option (nanopb_msgopt).no_unions = true;
-    oneof value {
-      sns_std_attr_value subtype = 1;
-      string str = 2;
-      float flt = 3;
-      sfixed64 sint = 4;
-      bool boolean = 5;
-    }
-  }
-  repeated data values = 1;
-}
-
-// An individual attribute from a Sensor
-message sns_std_attr {
-  // A standard list of attributes is available within sns_std_sensor_attr_id
-  // Additional attributes may be defined by sensors, using the format:
-  // <SENSOR_PROTO_NAME>_ATTRID_<ATTR_NAME> (e.g. SNS_ACCEL_ATTRID_ODR)
-  // Additional IDs must fall within the range of 1024-2047
-  required int32 attr_id = 1;
-  // Attribute value
-  required sns_std_attr_value value = 2;
-}
-
-// Error codes
-enum sns_std_error {
-  option (nanopb_enumopt).long_names = false;
-
-  /* No error occurred; success. */
-  SNS_STD_ERROR_NO_ERROR = 0;
-  /* Unfixable or internal error occurred. */
-  SNS_STD_ERROR_FAILED = 1;
-  /* This API is not supported or is not implemented. */
-  SNS_STD_ERROR_NOT_SUPPORTED = 2;
-  /* Message contains invalid data type,
-   * e.g., unknown message ID, unknown registry group, or unexpected
-   * Sensor UID. */
-  SNS_STD_ERROR_INVALID_TYPE = 3;
-  /* Catastrophic error; expect no further data */
-  SNS_STD_ERROR_INVALID_STATE = 4;
-  /* One or more argument values were outside of the valid range */
-  SNS_STD_ERROR_INVALID_VALUE = 5;
-  /* This operation is not available at this time */
-  SNS_STD_ERROR_NOT_AVAILABLE = 6;
-  /* This action was rejected due to the current policy settings */
-  SNS_STD_ERROR_POLICY = 7;
-}
-
-//The enum contains all the processor types supported.
-enum sns_std_client_processor {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_STD_CLIENT_PROCESSOR_SSC = 0;
-  SNS_STD_CLIENT_PROCESSOR_APSS = 1;
-  SNS_STD_CLIENT_PROCESSOR_ADSP = 2;
-  SNS_STD_CLIENT_PROCESSOR_MDSP = 3;
-  SNS_STD_CLIENT_PROCESSOR_CDSP = 4;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_step_detect.proto b/proprietary/vendor/etc/sensors/proto/sns_step_detect.proto
deleted file mode 100644
index e5fa164..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_step_detect.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// @file sns_step_detect.proto
-//
-// Defines message types for the Step Detect Sensor.
-//
-// Copyright (c) 2019 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Step Detect Sensor detects steps taken by the user
-//
-// The Step Detect event is generated when the user takes a step.
-// All clients to Step Detect get the same step detect event.
-// The timestamp of the event indicates the time of the latest detected step.
-
-// Step Detect Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "step_detect"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Step Detect Sensor
-enum sns_step_detect_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_STEP_DETECT_MSGID_SNS_STEP_DETECT_EVENT = 1029;
-}
-
-// Stream events:
-//
-// An event with SNS_STEP_DETECT_MSGID_SNS_STEP_DETECT_EVENT as the message id
-// is used to publish a step detect event
-//
-// Step detect sensor does not publish configuration events.
\ No newline at end of file
diff --git a/proprietary/vendor/etc/sensors/proto/sns_suid.proto b/proprietary/vendor/etc/sensors/proto/sns_suid.proto
deleted file mode 100644
index b83f431..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_suid.proto
+++ /dev/null
@@ -1,54 +0,0 @@
-// @file sns_suid.proto
-//
-// Defines standard message types to request and receive SUIDs.
-//
-// Copyright (c) 2016-2017,2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_type.proto";
-
-enum sns_suid_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_SUID_MSGID_SNS_SUID_REQ = 512;
-  SNS_SUID_MSGID_SNS_SUID_EVENT = 768;
-}
-
-// Well-known SUID for use by all clients.
-// All other Sensor UIDs must be discovered dynamically
-message sns_suid_sensor {
-  required fixed64 suid_low = 1 [default = 0xabababababababab];
-  required fixed64 suid_high = 2 [default = 0xabababababababab];
-}
-
-// Request sent by internal or external client for the list of SUIDs that
-// advertise the specified Data Type
-// Note: Additional requests arriving on the same connection, will not result
-// in a replaced request, but instead the new request will be appended to any
-// active registrations.
-message sns_suid_req {
-  required string data_type = 1;
-  // Register for updates to the list of SUIDs advertising data_type
-  optional bool register_updates = 2;
-
-  // Each data type may or may not have one sensor configured to be "default" through registry.
-  // If following field is set to true and :
-  // * A default for the data type is explicitly configured,
-  //   only the SUID of the default sensor will be sent via the suid event when available.
-  // * A default for the data type is not explicitly configured,
-  //   the SUID of the first sensor with matching data type will be sent via the suid event.
-  // If following field is set to false, all sensors with matching data type will be sent,
-  // as and when they become available.  
-  optional bool default_only = 3 [default = true];
-}
-
-// Event specifying the list of SUIDs associated with the given Data Type
-// Receipt of this event indicates that a change to this list has occurred
-// since the previous event.
-message sns_suid_event {
-  // Direct copy of sns_suid_req:data_type
-  required string data_type = 1;
-  repeated sns_std_suid suid = 2;
-}
diff --git a/proprietary/vendor/etc/sensors/proto/sns_thermopile.proto b/proprietary/vendor/etc/sensors/proto/sns_thermopile.proto
deleted file mode 100644
index 6e57b2a..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_thermopile.proto
+++ /dev/null
@@ -1,62 +0,0 @@
-// @file sns_thermopile.proto
-//
-// Defines the API for Thermopile Sensors.
-// All Thermopile Sensor drivers are required to comply with this API.
-// Any new functionality for Thermopile Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The Thermopile Temperature Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "thermopile".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in degrees Celsius/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in degrees Celsius unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The Thermopile Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-
-// Handling stream events:
-// 1. The Thermopile Sensor publishes data stream events using the
-//    sns_std_sensor_event message.
-// 2. Each stream event contains one output data field where data is
-//    factory calibrated and ordered as:
-//    data[0] = Object temperature in degrees Celsius
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The Thermopile Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The Thermopile Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The Thermopile Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The Thermopile Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API.
-// 3. The Thermopile Sensor could implement other test types.
-
-// Handling test events:
-// 1. The Thermopile Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_threshold.proto b/proprietary/vendor/etc/sensors/proto/sns_threshold.proto
deleted file mode 100644
index 3cf67b9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_threshold.proto
+++ /dev/null
@@ -1,91 +0,0 @@
-// @file sns_threshold.proto
-//
-// Defines standard message types for the Threshold Algorithm
-//
-// Copyright (c) 2018-2020 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std.proto";
-import "sns_std_sensor.proto";
-import "sns_resampler.proto";
-
-// Threshold Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "threshold"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_STREAMING
-
-// Sensor output event:
-// Threshold uses sns_std_sensor_event for it's output event.
-// An event is generated by the threshold algorithm only if the threshold is met
-// on any of the axis for the sensor.
-// Thresholding can be done as value based delta between current value and
-// the last generated output. Or thresholding can be done as the delta between
-// current value and the last output, as a percentage of the last output.
-// Thresholding can also be done based on the current value going beyond a particular
-// absolute threshold value.
-// When thresholding criteria is met , an event is generated by the algorithm.
-
-enum sns_threshold_msgid
-{
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_THRESHOLD_MSGID_SNS_THRESHOLD_CONFIG = 512;
-}
-
-//Thresholding types
-enum sns_threshold_type
-{
-  option (nanopb_enumopt).long_names = false;
-
-  // Provide thresholding as a delta between current value
-  // and last reported value, exceeding above the configured threshold.
-  SNS_THRESHOLD_TYPE_RELATIVE_VALUE = 0;
-
-  // Provide thresholding as a delta between current value
-  // and last reported value, compared as a percentage of the last reported value,
-  // where the percentage is the configured threshold.
-  SNS_THRESHOLD_TYPE_RELATIVE_PERCENT = 1;
-
-  // Provides thresholding of the current value against a fixed configured
-  // threshold value.
-  SNS_THRESHOLD_TYPE_ABSOLUTE = 2;
-
-  // Provides thresholding of angle between current and last reported quaternion
-  // for quaternion sensors, in radians
-  SNS_THRESHOLD_TYPE_ANGLE = 3;
-}
-
-// Configuration Message
-// Used to either request for a new configuration of the threshold Sensor or
-// alter an already existing configuration or query the current configuration.
-message sns_threshold_config
-{
-  // UID of the sensor from which data is being requested from.
-  required sns_std_suid sensor_uid = 1;
-
-  // The threshold value per axis.
-  // The number of threshold values need to be less than or equal to the number of
-  // sensor data axes.
-  // For SNS_THRESHOLD_TYPE_ANGLE, a single threshold_val value representing the
-  // angle between current and last reported quaternions
-  repeated float threshold_val = 2;
-
-  // Tells us how to use the thresholding value provided.
-  required  sns_threshold_type  threshold_type = 3;
-
-  // The message id to be used to configure the underlying sensor.
-  // This is used together with the below payload field.
-  required uint32 payload_cfg_msg_id = 4;
-
-  // Dynamic length payload, containing the actual data/configuration request
-  // This payload will need to be decoded separately, using the Sensor-specific
-  // header file.
-  required bytes payload = 5;
-}
-
-// Config is used to inform the client of the configuration that was set,
-// after a configuration is done .
-// The config message is sent back to the client
-// in the threshold config message.
-// All data events are generated as sns_std_sensor_event.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_tilt.proto b/proprietary/vendor/etc/sensors/proto/sns_tilt.proto
deleted file mode 100644
index faf095a..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_tilt.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// @file sns_tilt.proto
-//
-// Defines message types for the Tilt Sensor.
-//
-// Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Tilt Sensor looks for a change in angle of a gravity vector from an
-// anchor vector.
-//
-// The initial anchor vector is based on an average of one second of
-// accel data after initial activation.
-//
-// The gravity vector is calculated based on an average of two seconds of
-// accel data.
-//
-// The anchor vector is reset to the current gravity vector each time the
-// Tilt event is generated.
-// There is only one anchor vector shared amongst all clients.
-//
-// The Tilt event is generated when the current gravity vector is 35 degrees
-// or more from the anchor vector.
-
-// Tilt Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "tilt"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Tilt Sensor
-enum sns_tilt_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_TILT_MSGID_SNS_TILT_EVENT = 774;
-}
-
-// Stream events:
-//
-// A NULL message with message ID SNS_TILT_MSGID_SNS_TILT_EVENT is used to
-// publish tilt event
-//
-// Tilt does not publish configuration events.
-
diff --git a/proprietary/vendor/etc/sensors/proto/sns_tilt_to_wake.proto b/proprietary/vendor/etc/sensors/proto/sns_tilt_to_wake.proto
deleted file mode 100644
index ceabc92..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_tilt_to_wake.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-// @file sns_tilt_to_wake.proto
-//
-// Defines message types for the tilt_to_wake Sensor.
-//
-// Copyright (c) 2017 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The tilt_to_wake detects substantial phone rotation (gesture) within
-// limited period ending in a specific range of the pitch and roll angles.
-// It uses proximity sensor to block the tilt event reporting in pocket or purse
-
-// tilt_to_wake Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "tilt_to_wake"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for tilt_to_wake Sensor
-enum sns_tilt_to_wake_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_TILT_TO_WAKE_MSGID_SNS_TILT_TO_WAKE_EVENT = 775;
-}
-
-// Stream events:
-//
-// A NULL message with message ID SNS_TILT_TO_WAKE_MSGID_SNS_TILT_TO_WAKE_EVENT is used to
-// publish tilt_to_wake event
-//
-// tilt_to_wake does not publish configuration events.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_ultra_violet.proto b/proprietary/vendor/etc/sensors/proto/sns_ultra_violet.proto
deleted file mode 100644
index 3244cc9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_ultra_violet.proto
+++ /dev/null
@@ -1,72 +0,0 @@
-// @file sns_ultra_violet.proto
-//
-// Defines the API for Ultra Violet (UV) Sensors.
-// All UV Sensor drivers are required to comply with this API.
-// Any new functionality for UV Sensor can be defined in a
-// device specific API file.
-//
-// Copyright (c) 2016-2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-import "sns_physical_sensor_test.proto";
-import "sns_cal.proto";
-
-// Attribute requirements:
-// The UV Sensor publishes:
-// 1. SNS_STD_SENSOR_ATTRID_TYPE attribute value as "ultra_violet".
-// 2. SNS_STD_SENSOR_ATTRID_RESOLUTIONS attribute value in degrees mW/cm2/LSB.
-// 3. SNS_STD_SENSOR_ATTRID_RANGES attribute values in degrees mW/cm2 unit.
-// 4. See sns_std_sensor.proto for other attributes.
-
-// Handling stream requests:
-// 1. The UV Sensor handles the sns_std_sensor_config
-//    message request for all stream enable/update requests.
-
-// Handling stream events:
-// 1. The UV Sensor publishes UV data in ambient light using the
-//    sns_std_sensor_event message.
-// 2. Each stream event contains following factory calibrated data fields:
-//    data[0] = Bit mask to determine which outputs are supported:
-//              bit[0]: 1 if UV-A is supported else 0
-//              bit[1]: 1 if UV-B is supported else 0
-//              bit[2]: 1 if Total UV is supported else 0
-//              bit[3]: 1 if UV index is supported else 0
-//              all other bits are 0
-//    data[1] = UV-A radiation in mW/cm2
-//    data[2] = UV-B radiation in mW/cm2
-//    data[3] = Total UV radiation in mW/cm2
-//    data[4] = Unitless UV index number
-// 3. Each stream event publishes an accuracy field:
-//    SNS_STD_SENSOR_SAMPLE_STATUS_UNRELIABLE to mark invalid samples when hardware is
-//    yet to stabilize after the sensor is configured.
-//    SNS_STD_SENSOR_SAMPLE_STATUS_ACCURACY_HIGH to mark samples when they are valid.
-// 4. The UV Sensor publishes a configuration event using the
-//    sns_std_sensor_physical_config_event message.
-//    It publishes this event each time there is change in hardware config of the sensor
-//    and contains current physical sensor config of the sensor.
-// 5. The UV Sensor publishes a factory calibration event using the
-//    sns_cal_event message. It uses bias and scale_factor fields in this event.
-//    It publishes this event each time there is change in it's factory calibration
-//    data or when a client sends a new streaming request.
-
-// Handling self-test requests:
-// 1. The UV Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_COM test
-//    type using the physical sensor test API.
-// 2. The UV Sensor implements SNS_PHYSICAL_SENSOR_TEST_TYPE_FACTORY test
-//    type to determine factory calibration parameters using the physical
-//    sensor test API. The factory test for UV Sensor calibrates
-//    the sensor such that it's output is comparable to a standard
-//    UV Meter output in any lighting condition.
-// 3. The UV Sensor could implement other test types.
-
-// Handling test events:
-// 1. The UV Sensor uses sns_physical_sensor_test_event message to publish
-//    a test completion event.
-// 2. The test_passed field in sns_physical_sensor_test_event is used to output the
-//    pass/fail result of self-test execution.
-// 3. The test_data field in sns_physical_sensor_test_event could be used to output any
-//    driver-specific error data.
diff --git a/proprietary/vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto b/proprietary/vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto
deleted file mode 100644
index 37482d9..0000000
--- a/proprietary/vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// @file sns_wrist_tilt_gesture.proto
-//
-// Defines message types for the wrist_tilt_gesture Sensor.
-//
-// Copyright (c) 2018 Qualcomm Technologies, Inc.
-// All Rights Reserved.
-// Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-syntax = "proto2";
-import "nanopb.proto";
-import "sns_std_sensor.proto";
-
-// The Tilt Sensor looks for a change in angle of a gravity vector from an
-// anchor vector.
-//
-// The initial anchor vector is based on an average of one second of
-// accel data after initial activation.
-//
-// The gravity vector is calculated based on an average of two seconds of
-// accel data.
-//
-// The anchor vector is reset to the current gravity vector each time the
-// Tilt event is generated.
-// There is only one anchor vector shared amongst all clients.
-//
-// The Tilt event is generated when the current gravity vector is 35 degrees
-// or more from the anchor vector.
-
-// Tilt Sensor Attribute Requirements:
-// SNS_STD_SENSOR_ATTRID_TYPE: "wrist_tilt_gesture"
-// SNS_STD_SENSOR_ATTRID_STREAM_TYPE: SNS_STD_SENSOR_STREAM_TYPE_ON_CHANGE
-
-// Stream Requests:
-// - SNS_STD_SENSOR_MSGID_SNS_STD_ON_CHANGE_CONFIG is used to enable the sensor
-
-// Message IDs for Wrist Tilt Gesture Sensor
-enum sns_wrist_tilt_gesture_msgid {
-  option (nanopb_enumopt).long_names = false;
-
-  SNS_WRIST_TILT_GESTURE_MSGID_SNS_TILT_EVENT = 774;
-}
-
-// Stream events:
-//
-// A NULL message with message ID SNS_TILT_MSGID_SNS_TILT_EVENT is used to
-// publish tilt event
-//
-// Tilt does not publish configuration events.
-
diff --git a/proprietary/vendor/lib/hw/audio.primary.kona.so b/proprietary/vendor/lib/hw/audio.primary.cmi.so
similarity index 89%
rename from proprietary/vendor/lib/hw/audio.primary.kona.so
rename to proprietary/vendor/lib/hw/audio.primary.cmi.so
index 009acc6..7c62b08 100644
Binary files a/proprietary/vendor/lib/hw/audio.primary.kona.so and b/proprietary/vendor/lib/hw/audio.primary.cmi.so differ
diff --git a/proprietary/vendor/lib/liba2dpoffload.so b/proprietary/vendor/lib/liba2dpoffload_cmi.so
similarity index 70%
rename from proprietary/vendor/lib/liba2dpoffload.so
rename to proprietary/vendor/lib/liba2dpoffload_cmi.so
index 799f221..c5ef0d2 100644
Binary files a/proprietary/vendor/lib/liba2dpoffload.so and b/proprietary/vendor/lib/liba2dpoffload_cmi.so differ
diff --git a/proprietary/vendor/lib/libcamxexternalformatutils.so b/proprietary/vendor/lib/libcamxexternalformatutils.so
deleted file mode 100644
index bd17f08..0000000
Binary files a/proprietary/vendor/lib/libcamxexternalformatutils.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxfacialfeatures.so b/proprietary/vendor/lib/libcamxfacialfeatures.so
deleted file mode 100644
index e15cd40..0000000
Binary files a/proprietary/vendor/lib/libcamxfacialfeatures.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxfdalgo.so b/proprietary/vendor/lib/libcamxfdalgo.so
deleted file mode 100644
index aa45762..0000000
Binary files a/proprietary/vendor/lib/libcamxfdalgo.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxfdengine.so b/proprietary/vendor/lib/libcamxfdengine.so
deleted file mode 100644
index 7a883b6..0000000
Binary files a/proprietary/vendor/lib/libcamxfdengine.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxifestriping.so b/proprietary/vendor/lib/libcamxifestriping.so
deleted file mode 100644
index 364e46d..0000000
Binary files a/proprietary/vendor/lib/libcamxifestriping.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamximageformatutils.so b/proprietary/vendor/lib/libcamximageformatutils.so
deleted file mode 100644
index cfce1dd..0000000
Binary files a/proprietary/vendor/lib/libcamximageformatutils.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxncs.so b/proprietary/vendor/lib/libcamxncs.so
deleted file mode 100644
index 818b517..0000000
Binary files a/proprietary/vendor/lib/libcamxncs.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxstatscore.so b/proprietary/vendor/lib/libcamxstatscore.so
deleted file mode 100644
index 6262952..0000000
Binary files a/proprietary/vendor/lib/libcamxstatscore.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxswprocessalgo.so b/proprietary/vendor/lib/libcamxswprocessalgo.so
deleted file mode 100644
index ccf0973..0000000
Binary files a/proprietary/vendor/lib/libcamxswprocessalgo.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcamxtintlessalgo.so b/proprietary/vendor/lib/libcamxtintlessalgo.so
deleted file mode 100644
index deec789..0000000
Binary files a/proprietary/vendor/lib/libcamxtintlessalgo.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so b/proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so
index 974bc83..c325fed 100644
Binary files a/proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so and b/proprietary/vendor/lib64/hw/fingerprint.goodix_fod.default.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc_system.so b/proprietary/vendor/lib64/libcdsprpc_system.so
deleted file mode 100644
index 3d0d418..0000000
Binary files a/proprietary/vendor/lib64/libcdsprpc_system.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libflaw.so b/proprietary/vendor/lib64/libflaw.so
new file mode 100644
index 0000000..2f4f190
Binary files /dev/null and b/proprietary/vendor/lib64/libflaw.so differ