diff --git a/Android.bp b/Android.bp
index d5ff2c9..c0ed453 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,5 +7,6 @@
 soong_namespace {
     imports: [
         "hardware/qcom-caf/bootctrl",
+        "vendor/qcom/opensource/commonsys-intf/display",
     ],
 }
diff --git a/common.mk b/common.mk
index 71bfd0a..706d02d 100644
--- a/common.mk
+++ b/common.mk
@@ -168,7 +168,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.4.vendor \
     libgralloc.qti \
-    libqdMetaData
+    libqdMetaData \
+    vendor.qti.hardware.display.config-V1-ndk_platform.vendor \
+    vendor.qti.hardware.display.config-V2-ndk_platform.vendor \
+    vendor.qti.hardware.display.config-V3-ndk_platform.vendor \
+    vendor.qti.hardware.display.config-V4-ndk_platform.vendor \
+    vendor.qti.hardware.display.config-V5-ndk_platform.vendor \
+    vendor.qti.hardware.display.config-V6-ndk_platform.vendor
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
@@ -189,6 +195,11 @@ PRODUCT_PACKAGES += \
     libhidltransport.vendor \
     libhwbinder.vendor
 
+# Identity
+PRODUCT_PACKAGES += \
+    android.hardware.identity-V3-ndk_platform.vendor \
+    android.hardware.keymaster-V3-ndk_platform.vendor
+
 # IPACM
 PRODUCT_PACKAGES += \
     ipacm \
@@ -209,6 +220,9 @@ PRODUCT_PACKAGES += \
 # Keymaster
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@4.1.vendor \
+    android.hardware.security.keymint-V1-ndk_platform.vendor \
+    android.hardware.security.secureclock-V1-ndk_platform.vendor \
+    android.hardware.security.sharedsecret-V1-ndk_platform.vendor \
     libkeymaster_messages.vendor
 
 # Media
@@ -279,6 +293,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libvndfwk_detect_jni.qti_vendor
 
+# QXR
+PRODUCT_PACKAGES += \
+    android.hardware.common-V2-ndk_platform.vendor
+
 # Recovery
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/init.recovery.qcom.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.qcom.rc
diff --git a/ndk/Android.bp b/ndk/Android.bp
new file mode 100644
index 0000000..4a5c850
--- /dev/null
+++ b/ndk/Android.bp
@@ -0,0 +1,41 @@
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V1-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V1-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V2-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V2-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V3-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V3-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V4-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V4-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V5-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V5-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V6-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V6-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}