diff --git a/Android.bp b/Android.bp
index 7225c3e..3cf3c0e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,35 +4,71 @@
 prebuilt_etc {
     name: "llndk.libraries.29.txt",
     target: {
-        android_arm64: {
-            src: "arm64/configs/llndk.libraries.29.txt",
-        },
         android_arm: {
             src: "arm/configs/llndk.libraries.29.txt",
         },
-        android_x86_64: {
-            src: "x86_64/configs/llndk.libraries.29.txt",
+        android_arm64: {
+            src: "arm64/configs/llndk.libraries.29.txt",
         },
         android_x86: {
             src: "x86/configs/llndk.libraries.29.txt",
         },
+        android_x86_64: {
+            src: "x86_64/configs/llndk.libraries.29.txt",
+        },
     },
 }
 
 prebuilt_etc {
     name: "vndksp.libraries.29.txt",
     target: {
+        android_arm: {
+            src: "arm/configs/vndksp.libraries.29.txt",
+        },
         android_arm64: {
             src: "arm64/configs/vndksp.libraries.29.txt",
         },
-        android_arm: {
-            src: "arm/configs/vndksp.libraries.29.txt",
+        android_x86: {
+            src: "x86/configs/vndksp.libraries.29.txt",
         },
         android_x86_64: {
             src: "x86_64/configs/vndksp.libraries.29.txt",
         },
+    },
+}
+
+prebuilt_etc {
+    name: "vndkcore.libraries.29.txt",
+    target: {
+        android_arm: {
+            src: "arm/configs/vndkcore.libraries.29.txt",
+        },
+        android_arm64: {
+            src: "arm64/configs/vndkcore.libraries.29.txt",
+        },
         android_x86: {
-            src: "x86/configs/vndksp.libraries.29.txt",
+            src: "x86/configs/vndkcore.libraries.29.txt",
+        },
+        android_x86_64: {
+            src: "x86_64/configs/vndkcore.libraries.29.txt",
+        },
+    },
+}
+
+prebuilt_etc {
+    name: "vndkprivate.libraries.29.txt",
+    target: {
+        android_arm: {
+            src: "arm/configs/vndkprivate.libraries.29.txt",
+        },
+        android_arm64: {
+            src: "arm64/configs/vndkprivate.libraries.29.txt",
+        },
+        android_x86: {
+            src: "x86/configs/vndkprivate.libraries.29.txt",
+        },
+        android_x86_64: {
+            src: "x86_64/configs/vndkprivate.libraries.29.txt",
         },
     },
 }
diff --git a/arm/Android.bp b/arm/Android.bp
index 4405711..7da2ff2 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -260,6 +260,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -3704,9 +3706,9 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         arm: {
+            relative_install_path: "hw",
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
index 4f1bd4f..01c266d 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
index af6fc7e..7e849fe 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
index c5fbb8f..5a20f31 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
index 4e9e5d9..99b1a45 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
index ab4b3ab..855cd4f 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
index 0f1a517..091cfec 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
index bf57b6c..0cdc6a4 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
index 20f504d..16b2263 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
index c9d1e7c..8cac3ad 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
index 7a10d23..7394c33 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
index 70cff5f..dd1b062 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
index b8521df..efb103c 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
index b6c5c5d..bb9b74b 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
index c050089..91f0f2f 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
index e03b89c..c29d953 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
index b631b28..2f44d15 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
index d9a145f..a7f781e 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
index 402f2ad..f3121ee 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
index 09e4904..5a08a96 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index 2529085..a51f641 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -260,6 +260,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -3931,9 +3933,9 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         arm: {
+            relative_install_path: "hw",
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
index 4f1bd4f..01c266d 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
index 34dc00f..bbde979 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
index c5fbb8f..5a20f31 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
index 4e9e5d9..99b1a45 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
index ab4b3ab..855cd4f 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
index 0f1a517..091cfec 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
index bf57b6c..0cdc6a4 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
index 20f504d..16b2263 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
index c9d1e7c..8cac3ad 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
index 7a10d23..7394c33 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
index 70cff5f..dd1b062 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
index b8521df..efb103c 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
index b6c5c5d..bb9b74b 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
index c050089..91f0f2f 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
index e03b89c..c29d953 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
index b631b28..2f44d15 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
index d9a145f..a7f781e 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
index 749fe87..6cc8dbd 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
index 09e4904..5a08a96 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm/configs/vndkcore.libraries.txt b/arm/configs/vndkcore.libraries.29.txt
similarity index 100%
rename from arm/configs/vndkcore.libraries.txt
rename to arm/configs/vndkcore.libraries.29.txt
diff --git a/arm/configs/vndkprivate.libraries.txt b/arm/configs/vndkprivate.libraries.29.txt
similarity index 100%
rename from arm/configs/vndkprivate.libraries.txt
rename to arm/configs/vndkprivate.libraries.29.txt
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 771d2e1..440f324 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -264,6 +264,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -4042,6 +4044,9 @@
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so"],
         },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so"],
+        },
     },
 }
 
@@ -4428,12 +4433,13 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         arm: {
+            relative_install_path: "hw",
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
         arm64: {
+            relative_install_path: "hw",
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libaudioutils.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libaudioutils.so
index 3b94f61..1d9c49f 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libaudioutils.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so
index 8568f3a..61b93a5 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
index d6e3c89..7f2d71b 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so
index c87c0bf..1629a19 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
index 11f6c17..fc5abae 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so
index ca53fa8..dad209b 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libpower.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libpower.so
index 18a335b..8a4bc18 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libpower.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libsqlite.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libsqlite.so
index d4e7c00..7409839 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libsqlite.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
index 22088ea..9c45c7f 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so
index 0583726..bece792 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libsysutils.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libsysutils.so
index 555d8b4..4ba951b 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libsysutils.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libui.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libui.so
index 478c521..b742df9 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libui.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libRSCpuRef.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libRSCpuRef.so
index c56ad3b..b39126d 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libRSCpuRef.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbacktrace.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbacktrace.so
index 8c33fa6..c97078e 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbacktrace.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
index de65f11..fb7e450 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libblas.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libblas.so
index bcb5b25..b3f9f2a 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libblas.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libc++.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libc++.so
index 3fc0cf9..9cbbfa9 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libc++.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
index 74fc0e1..bd16ad2 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so
index 43bab8a..c2b1911 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libaudioutils.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libaudioutils.so
index 049a348..eee7300 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libaudioutils.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so
index 8d541d4..8e79320 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
index 0f30a7a..4c14f04 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libhardware_legacy.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libhardware_legacy.so
index e5fa66f..d006c07 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libhardware_legacy.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
index d58d0bc..a42cc7d 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_omx.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_omx.so
index 07d5b7e..d3949dd 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_omx.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libpower.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libpower.so
index e1937c7..8e8aa5d 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libpower.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libsqlite.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libsqlite.so
index 250dbf8..aef7ee0 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libsqlite.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
index 6784c37..216a602 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so
new file mode 100755
index 0000000..81b8289
--- /dev/null
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libsysutils.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libsysutils.so
index 48593f3..40b29a5 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libsysutils.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
index d405fb4..d365c37 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libRSCpuRef.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libRSCpuRef.so
index 7cb6c36..602aac3 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libRSCpuRef.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbacktrace.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbacktrace.so
index 79a8840..d2bbbf0 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbacktrace.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
index 73becd5..15983c0 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libblas.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libblas.so
index 2ac7272..d072148 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libblas.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so
index 1066b91..8b52c17 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
index db5204e..f60174e 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so
index 3155a56..e5e9dae 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm64/configs/module_paths.txt b/arm64/configs/module_paths.txt
index 97ec228..b60634f 100644
--- a/arm64/configs/module_paths.txt
+++ b/arm64/configs/module_paths.txt
@@ -207,7 +207,7 @@
 libstagefright_bufferpool@2.0.so frameworks/av/media/bufferpool/2.0 frameworks/av/media/bufferpool/2.0
 libstagefright_bufferqueue_helper.so frameworks/av/media/libstagefright/bqhelper
 libstagefright_foundation.so frameworks/av/media/libstagefright/foundation frameworks/av/media/libstagefright/foundation
-libstagefright_omx.so
+libstagefright_omx.so frameworks/av/media/libstagefright/omx
 libstagefright_omx_utils.so frameworks/av/media/libstagefright/omx
 libstagefright_xmlparser.so frameworks/av/media/libstagefright/xmlparser
 libsysutils.so system/core/libsysutils system/core/libsysutils
diff --git a/arm64/configs/vndkcore.libraries.txt b/arm64/configs/vndkcore.libraries.29.txt
similarity index 100%
rename from arm64/configs/vndkcore.libraries.txt
rename to arm64/configs/vndkcore.libraries.29.txt
diff --git a/arm64/configs/vndkprivate.libraries.txt b/arm64/configs/vndkprivate.libraries.29.txt
similarity index 100%
rename from arm64/configs/vndkprivate.libraries.txt
rename to arm64/configs/vndkprivate.libraries.29.txt
diff --git a/common/Android.bp b/common/Android.bp
index d5f5323..3a1dc5c 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -2,163 +2,8 @@
 // DO NOT EDIT
 
 filegroup {
-    name: "vndk-v29-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libmedia_helper.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libpuresoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libkeymaster_messages.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libhwbinder_noltopgo.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libaudioroute.so-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libsoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libprotobuf-cpp-lite.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libprotobuf-cpp-full.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+    name: "vndk-v29-libminijail.so-notice",
+    srcs: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
 filegroup {
@@ -167,23 +12,18 @@
 }
 
 filegroup {
-    name: "vndk-v29-libexpat.so-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+    name: "vndk-v29-libhwbinder_noltopgo.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v29-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+    name: "vndk-v29-libldacBT_abr.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v29-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+    name: "vndk-v29-libz.so-notice",
+    srcs: ["NOTICE_FILES/libz.so.txt"],
 }
 
 filegroup {
@@ -192,18 +32,13 @@
 }
 
 filegroup {
-    name: "vndk-v29-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+    name: "vndk-v29-libldacBT_enc.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v29-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v29-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+    name: "vndk-v29-libhardware.so-notice",
+    srcs: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
 filegroup {
@@ -212,8 +47,43 @@
 }
 
 filegroup {
-    name: "vndk-v29-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+    name: "vndk-v29-libspeexresampler.so-notice",
+    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libjpeg.so-notice",
+    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libnetutils.so-notice",
+    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libprotobuf-cpp-full.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libevent.so-notice",
+    srcs: ["NOTICE_FILES/libevent.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libstagefright_omx.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libcompiler_rt.so-notice",
+    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
 filegroup {
@@ -222,8 +92,28 @@
 }
 
 filegroup {
-    name: "vndk-v29-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+    name: "vndk-v29-libpower.so-notice",
+    srcs: ["NOTICE_FILES/libpower.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libblas.so-notice",
+    srcs: ["NOTICE_FILES/libblas.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libcurl.so-notice",
+    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libstagefright_omx_utils.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libcap.so-notice",
+    srcs: ["NOTICE_FILES/libcap.so.txt"],
 }
 
 filegroup {
@@ -232,11 +122,121 @@
 }
 
 filegroup {
+    name: "vndk-v29-liblz4.so-notice",
+    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libtinyxml2.so-notice",
+    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libui.so-notice",
+    srcs: ["NOTICE_FILES/libui.so.txt"],
+}
+
+filegroup {
     name: "vndk-v29-libutilscallstack.so-notice",
     srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
 filegroup {
+    name: "vndk-v29-libcrypto.so-notice",
+    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libprotobuf-cpp-lite.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libsqlite.so-notice",
+    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libssl.so-notice",
+    srcs: ["NOTICE_FILES/libssl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libxml2.so-notice",
+    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libexpat.so-notice",
+    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libtinyalsa.so-notice",
+    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libsoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libnl.so-notice",
+    srcs: ["NOTICE_FILES/libnl.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libmedia_helper.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libstagefright_foundation.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+}
+
+filegroup {
     name: "vndk-v29-libkeymaster_portable.so-notice",
     srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
 }
+
+filegroup {
+    name: "vndk-v29-libhardware_legacy.so-notice",
+    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libexif.so-notice",
+    srcs: ["NOTICE_FILES/libexif.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libaudioroute.so-notice",
+    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libkeymaster_messages.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libmedia_omx.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libutils.so-notice",
+    srcs: ["NOTICE_FILES/libutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libcutils.so-notice",
+    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v29-libpcre2.so-notice",
+    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+}
diff --git a/x86/Android.bp b/x86/Android.bp
index b1888b7..47d0a72 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -260,6 +260,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -3704,9 +3706,9 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         x86: {
+            relative_install_path: "hw",
             srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86/arch-x86-x86/shared/vndk-core/libaudioutils.so b/x86/arch-x86-x86/shared/vndk-core/libaudioutils.so
index ccd41a3..e2cb687 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libaudioutils.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libbinder.so b/x86/arch-x86-x86/shared/vndk-core/libbinder.so
index 7d3e729..6a9f340 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libbinder.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libgui.so b/x86/arch-x86-x86/shared/vndk-core/libgui.so
index 37dbaba..978e300 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libgui.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libhardware_legacy.so b/x86/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
index 7e369b7..086469b 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libmedia_helper.so b/x86/arch-x86-x86/shared/vndk-core/libmedia_helper.so
index aeba397..0effc93 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libmedia_helper.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libmedia_omx.so b/x86/arch-x86-x86/shared/vndk-core/libmedia_omx.so
index 95eeddf..2e0288c 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libmedia_omx.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libpower.so b/x86/arch-x86-x86/shared/vndk-core/libpower.so
index 49ec0f7..b4099f4 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libpower.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libpower.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libsqlite.so b/x86/arch-x86-x86/shared/vndk-core/libsqlite.so
index 8147531..896617a 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libsqlite.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
index c4dce5b..c1cc488 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so b/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
index 535806b..bdb7189 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libsysutils.so b/x86/arch-x86-x86/shared/vndk-core/libsysutils.so
index 24522b0..2524551 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libsysutils.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-core/libui.so b/x86/arch-x86-x86/shared/vndk-core/libui.so
index d26ce8f..ce1afc9 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libui.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so b/x86/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
index d5f8a34..d3a280b 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libbacktrace.so b/x86/arch-x86-x86/shared/vndk-sp/libbacktrace.so
index a19ab3b..7cd4225 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libbacktrace.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libbcinfo.so b/x86/arch-x86-x86/shared/vndk-sp/libbcinfo.so
index c611591..680c8ce 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libbcinfo.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libblas.so b/x86/arch-x86-x86/shared/vndk-sp/libblas.so
index cd6a444..2cc5fe0 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libblas.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libc++.so b/x86/arch-x86-x86/shared/vndk-sp/libc++.so
index cdf7c7e..1cd48d7 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libc++.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so b/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
index a8bd364..ae8f10a 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libunwindstack.so b/x86/arch-x86-x86/shared/vndk-sp/libunwindstack.so
index 6299a8f..e1076c6 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libunwindstack.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 3281044..77e2188 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -260,6 +260,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -3931,9 +3933,9 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         x86: {
+            relative_install_path: "hw",
             srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libaudioutils.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libaudioutils.so
index ccd41a3..e2cb687 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libaudioutils.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libbinder.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libbinder.so
index 73fa6b4..8a2d7b4 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libbinder.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libgui.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libgui.so
index 37dbaba..978e300 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libgui.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libhardware_legacy.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
index 7e369b7..086469b 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_helper.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_helper.so
index aeba397..0effc93 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_helper.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_omx.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_omx.so
index 95eeddf..2e0288c 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_omx.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libpower.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libpower.so
index 49ec0f7..b4099f4 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libpower.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libpower.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libsqlite.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libsqlite.so
index 8147531..896617a 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libsqlite.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
index c4dce5b..c1cc488 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_omx.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
index 535806b..bdb7189 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libsysutils.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libsysutils.so
index 24522b0..2524551 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libsysutils.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libui.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libui.so
index d26ce8f..ce1afc9 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libui.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
index d5f8a34..d3a280b 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libbacktrace.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libbacktrace.so
index a19ab3b..7cd4225 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libbacktrace.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libbcinfo.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libbcinfo.so
index c611591..680c8ce 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libbcinfo.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libblas.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libblas.so
index cd6a444..2cc5fe0 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libblas.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libc++.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libc++.so
index cdf7c7e..1cd48d7 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libc++.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
index 80fa0df..5e5ff91 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libunwindstack.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libunwindstack.so
index 6299a8f..e1076c6 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libunwindstack.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/x86/configs/vndkcore.libraries.txt b/x86/configs/vndkcore.libraries.29.txt
similarity index 100%
rename from x86/configs/vndkcore.libraries.txt
rename to x86/configs/vndkcore.libraries.29.txt
diff --git a/x86/configs/vndkprivate.libraries.txt b/x86/configs/vndkprivate.libraries.29.txt
similarity index 100%
rename from x86/configs/vndkprivate.libraries.txt
rename to x86/configs/vndkprivate.libraries.29.txt
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 3e5bac5..81a1d47 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -264,6 +264,8 @@
         "ld.config.29.txt",
         "llndk.libraries.29.txt",
         "vndksp.libraries.29.txt",
+        "vndkcore.libraries.29.txt",
+        "vndkprivate.libraries.29.txt",
     ],
 }
 
@@ -4042,6 +4044,9 @@
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so"],
         },
+        x86_64: {
+            srcs: ["arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so"],
+        },
     },
 }
 
@@ -4428,12 +4433,13 @@
         enabled: true,
         support_system_process: true,
     },
-    relative_install_path: "hw",
     arch: {
         x86: {
+            relative_install_path: "hw",
             srcs: ["arch-x86-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
         x86_64: {
+            relative_install_path: "hw",
             srcs: ["arch-x86_64-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libaudioutils.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libaudioutils.so
index fe498c7..76f8108 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libaudioutils.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libbinder.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libbinder.so
index c659319..789a3ca 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libbinder.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
index 146a373..9b9b8d1 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so
index 1b412bb..e5d3ba3 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
index 851e2fe..83a8654 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_omx.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_omx.so
index a78aedc..d483461 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_omx.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libpower.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libpower.so
index 9c73504..8e244b7 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libpower.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libpower.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libsqlite.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libsqlite.so
index 416d594..bf285aa 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libsqlite.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
index b37a002..935416f 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
index a0404eb..5105350 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libsysutils.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libsysutils.so
index 084130b..8767518 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libsysutils.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
index e959ece..36243e7 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libRSCpuRef.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libRSCpuRef.so
index 25656e4..9f4439a 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libRSCpuRef.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbacktrace.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbacktrace.so
index 1fabe67..bbb5538 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbacktrace.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
index cd3d449..eeaa211 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libblas.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libblas.so
index 511c33c..70f880d 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libblas.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libc++.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libc++.so
index ff888da..992ebf1 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libc++.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
index 0daac7f..06cf3f0 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libunwindstack.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libunwindstack.so
index 7ba6570..14af383 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libunwindstack.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libaudioutils.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libaudioutils.so
index 613c5c1..76ee8d9 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libaudioutils.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libbinder.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libbinder.so
index f2f7e9b..e518975 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libbinder.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libgui.so
index c265d02..07b8a23 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libgui.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libhardware_legacy.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libhardware_legacy.so
index 3bbd285..e775d6f 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libhardware_legacy.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_helper.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_helper.so
index b84519d..028222b 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_helper.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_omx.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_omx.so
index 0a4df2e..7b85f6c 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_omx.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libpower.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libpower.so
index 992f2ac..8a01cec 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libpower.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libpower.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsqlite.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsqlite.so
index 29fbc55..103aa3b 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsqlite.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
index a4a2534..686df7a 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so
new file mode 100755
index 0000000..1a39618
--- /dev/null
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsysutils.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsysutils.so
index 001f5af..637fc92 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsysutils.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
index d93ce13..d007749 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libui.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libRSCpuRef.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libRSCpuRef.so
index a7dae73..c0c9f22 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libRSCpuRef.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbacktrace.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbacktrace.so
index a3506a9..46cc778 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbacktrace.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbcinfo.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbcinfo.so
index c588511..3e5435f 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbcinfo.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libblas.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libblas.so
index 2f328da..6d87b38 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libblas.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libc++.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libc++.so
index f6380b5..8d8086b 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libc++.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
index 0b105e0..8321bed 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libunwindstack.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libunwindstack.so
index 947a760..85f27ee 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libunwindstack.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/x86_64/configs/module_paths.txt b/x86_64/configs/module_paths.txt
index 530e215..4eae479 100644
--- a/x86_64/configs/module_paths.txt
+++ b/x86_64/configs/module_paths.txt
@@ -207,7 +207,7 @@
 libstagefright_bufferpool@2.0.so frameworks/av/media/bufferpool/2.0 frameworks/av/media/bufferpool/2.0
 libstagefright_bufferqueue_helper.so frameworks/av/media/libstagefright/bqhelper
 libstagefright_foundation.so frameworks/av/media/libstagefright/foundation frameworks/av/media/libstagefright/foundation
-libstagefright_omx.so
+libstagefright_omx.so frameworks/av/media/libstagefright/omx
 libstagefright_omx_utils.so frameworks/av/media/libstagefright/omx
 libstagefright_xmlparser.so frameworks/av/media/libstagefright/xmlparser
 libsysutils.so system/core/libsysutils system/core/libsysutils
diff --git a/x86_64/configs/vndkcore.libraries.txt b/x86_64/configs/vndkcore.libraries.29.txt
similarity index 100%
rename from x86_64/configs/vndkcore.libraries.txt
rename to x86_64/configs/vndkcore.libraries.29.txt
diff --git a/x86_64/configs/vndkprivate.libraries.txt b/x86_64/configs/vndkprivate.libraries.29.txt
similarity index 100%
rename from x86_64/configs/vndkprivate.libraries.txt
rename to x86_64/configs/vndkprivate.libraries.29.txt