diff --git a/vndk/tools/definition-tool/datasets/eligible-list-master-properties.csv b/vndk/tools/definition-tool/datasets/eligible-list-master-properties.csv
index 44feb54b9..1785128f0 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-master-properties.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-master-properties.csv
@@ -13,6 +13,7 @@ android.hardware.audio.common@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.audio.common@2.0-util,True,False,True,cc_library_shared
 android.hardware.audio.common@4.0,True,False,True,hidl_interface
 android.hardware.audio.common@4.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.audio.common@4.0-util,True,False,True,cc_library_shared
 android.hardware.audio.effect@2.0,True,False,True,hidl_interface
 android.hardware.audio.effect@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.audio.effect@4.0,True,False,True,hidl_interface
@@ -31,6 +32,8 @@ android.hardware.automotive.vehicle@2.0,True,False,True,hidl_interface
 android.hardware.automotive.vehicle@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.biometrics.fingerprint@2.1,True,False,True,hidl_interface
 android.hardware.biometrics.fingerprint@2.1-adapter-helper,True,False,True,hidl_interface
+android.hardware.bluetooth.a2dp@1.0,True,False,True,hidl_interface
+android.hardware.bluetooth.a2dp@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.boot@1.0,True,False,True,hidl_interface
@@ -243,8 +246,12 @@ android.hidl.token@1.0-adapter-helper,True,False,True,hidl_interface
 android.hidl.token@1.0-utils,True,False,True,cc_library
 android.system.net.netd@1.0,True,False,True,hidl_interface
 android.system.net.netd@1.0-adapter-helper,True,False,True,hidl_interface
+android.system.net.netd@1.1,True,False,True,hidl_interface
+android.system.net.netd@1.1-adapter-helper,True,False,True,hidl_interface
 android.system.wifi.keystore@1.0,True,False,True,hidl_interface
 android.system.wifi.keystore@1.0-adapter-helper,True,False,True,hidl_interface
+hardware.google.media.c2@1.0,False,False,True,hidl_interface
+hardware.google.media.c2@1.0-adapter-helper,False,False,True,hidl_interface
 hidl.tests.vendor@1.0,False,False,True,hidl_interface
 hidl.tests.vendor@1.0-adapter-helper,False,False,True,hidl_interface
 hidl.tests.vendor@1.1,False,False,True,hidl_interface
@@ -383,7 +390,7 @@ libunwindstack,True,True,True,cc_library
 libusb,False,False,True,cc_library
 libusbhost,True,False,True,cc_library
 libutils,True,True,True,cc_library
-libutilscallstack,True,True,False,cc_library
+libutilscallstack,True,True,True,cc_library
 libvixl-arm,True,False,True,cc_library
 libvixl-arm64,True,False,True,cc_library
 libvorbisidec,True,False,True,cc_library
diff --git a/vndk/tools/definition-tool/datasets/eligible-list-master.csv b/vndk/tools/definition-tool/datasets/eligible-list-master.csv
index d3b513acf..e32c6cb57 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-master.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-master.csv
@@ -6,6 +6,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.audio.common-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@2.0-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@2.0.so,VNDK,
+/system/${LIB}/android.hardware.audio.common@4.0-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@4.0.so,VNDK,
 /system/${LIB}/android.hardware.audio.effect@2.0.so,VNDK,
 /system/${LIB}/android.hardware.audio.effect@4.0.so,VNDK,
@@ -16,6 +17,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.vehicle@2.0.so,VNDK,
 /system/${LIB}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
+/system/${LIB}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -108,6 +110,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/android.system.net.netd@1.0.so,VNDK,
+/system/${LIB}/android.system.net.netd@1.1.so,VNDK,
 /system/${LIB}/android.system.wifi.keystore@1.0.so,VNDK,
 /system/${LIB}/drm/libfwdlockengine.so,FWK-ONLY,
 /system/${LIB}/extractors/libaacextractor.so,FWK-ONLY,
@@ -456,7 +459,7 @@ Path,Tag,Comments
 /system/${LIB}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
-/system/${LIB}/libutilscallstack.so,VNDK-SP-Private,
+/system/${LIB}/libutilscallstack.so,VNDK-SP,
 /system/${LIB}/libvintf.so,FWK-ONLY,
 /system/${LIB}/libvixl-arm.so,VNDK,
 /system/${LIB}/libvixl-arm64.so,VNDK,
@@ -464,7 +467,7 @@ Path,Tag,Comments
 /system/${LIB}/libvixld-arm64.so,FWK-ONLY,
 /system/${LIB}/libvndksupport.so,LL-NDK,
 /system/${LIB}/libvorbisidec.so,VNDK,
-/system/${LIB}/libvulkan.so,FWK-ONLY,
+/system/${LIB}/libvulkan.so,LL-NDK,
 /system/${LIB}/libwebviewchromium_loader.so,FWK-ONLY,
 /system/${LIB}/libwebviewchromium_plat_support.so,FWK-ONLY,
 /system/${LIB}/libwfds.so,FWK-ONLY,
@@ -486,6 +489,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@2.0-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@2.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@4.0-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@4.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.effect@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.effect@4.0.so,VNDK,
@@ -496,6 +500,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.automotive.vehicle@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -581,6 +586,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.system.net.netd@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.system.net.netd@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.system.wifi.keystore@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libadf.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libaudioroute.so,VNDK,
@@ -715,7 +721,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwind.so,VNDK-SP-Private,
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libutils.so,VNDK-SP,
-/system/${LIB}/vndk-sp${VNDK_VER}/libutilscallstack.so,VNDK-SP-Private,
+/system/${LIB}/vndk-sp${VNDK_VER}/libutilscallstack.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libz.so,VNDK-SP,
 /vendor/${LIB}/hidl.tests.vendor@1.0.so,VND-ONLY,
 /vendor/${LIB}/hidl.tests.vendor@1.1.so,VND-ONLY,
diff --git a/vndk/tools/definition-tool/datasets/eligible-list-p-release-properties.csv b/vndk/tools/definition-tool/datasets/eligible-list-p-release-properties.csv
index 44feb54b9..1785128f0 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-p-release-properties.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-p-release-properties.csv
@@ -13,6 +13,7 @@ android.hardware.audio.common@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.audio.common@2.0-util,True,False,True,cc_library_shared
 android.hardware.audio.common@4.0,True,False,True,hidl_interface
 android.hardware.audio.common@4.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.audio.common@4.0-util,True,False,True,cc_library_shared
 android.hardware.audio.effect@2.0,True,False,True,hidl_interface
 android.hardware.audio.effect@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.audio.effect@4.0,True,False,True,hidl_interface
@@ -31,6 +32,8 @@ android.hardware.automotive.vehicle@2.0,True,False,True,hidl_interface
 android.hardware.automotive.vehicle@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.biometrics.fingerprint@2.1,True,False,True,hidl_interface
 android.hardware.biometrics.fingerprint@2.1-adapter-helper,True,False,True,hidl_interface
+android.hardware.bluetooth.a2dp@1.0,True,False,True,hidl_interface
+android.hardware.bluetooth.a2dp@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.boot@1.0,True,False,True,hidl_interface
@@ -243,8 +246,12 @@ android.hidl.token@1.0-adapter-helper,True,False,True,hidl_interface
 android.hidl.token@1.0-utils,True,False,True,cc_library
 android.system.net.netd@1.0,True,False,True,hidl_interface
 android.system.net.netd@1.0-adapter-helper,True,False,True,hidl_interface
+android.system.net.netd@1.1,True,False,True,hidl_interface
+android.system.net.netd@1.1-adapter-helper,True,False,True,hidl_interface
 android.system.wifi.keystore@1.0,True,False,True,hidl_interface
 android.system.wifi.keystore@1.0-adapter-helper,True,False,True,hidl_interface
+hardware.google.media.c2@1.0,False,False,True,hidl_interface
+hardware.google.media.c2@1.0-adapter-helper,False,False,True,hidl_interface
 hidl.tests.vendor@1.0,False,False,True,hidl_interface
 hidl.tests.vendor@1.0-adapter-helper,False,False,True,hidl_interface
 hidl.tests.vendor@1.1,False,False,True,hidl_interface
@@ -383,7 +390,7 @@ libunwindstack,True,True,True,cc_library
 libusb,False,False,True,cc_library
 libusbhost,True,False,True,cc_library
 libutils,True,True,True,cc_library
-libutilscallstack,True,True,False,cc_library
+libutilscallstack,True,True,True,cc_library
 libvixl-arm,True,False,True,cc_library
 libvixl-arm64,True,False,True,cc_library
 libvorbisidec,True,False,True,cc_library
diff --git a/vndk/tools/definition-tool/datasets/eligible-list-p-release.csv b/vndk/tools/definition-tool/datasets/eligible-list-p-release.csv
index d3b513acf..e32c6cb57 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-p-release.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-p-release.csv
@@ -6,6 +6,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.audio.common-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@2.0-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@2.0.so,VNDK,
+/system/${LIB}/android.hardware.audio.common@4.0-util.so,VNDK,
 /system/${LIB}/android.hardware.audio.common@4.0.so,VNDK,
 /system/${LIB}/android.hardware.audio.effect@2.0.so,VNDK,
 /system/${LIB}/android.hardware.audio.effect@4.0.so,VNDK,
@@ -16,6 +17,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.vehicle@2.0.so,VNDK,
 /system/${LIB}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
+/system/${LIB}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -108,6 +110,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/android.system.net.netd@1.0.so,VNDK,
+/system/${LIB}/android.system.net.netd@1.1.so,VNDK,
 /system/${LIB}/android.system.wifi.keystore@1.0.so,VNDK,
 /system/${LIB}/drm/libfwdlockengine.so,FWK-ONLY,
 /system/${LIB}/extractors/libaacextractor.so,FWK-ONLY,
@@ -456,7 +459,7 @@ Path,Tag,Comments
 /system/${LIB}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
-/system/${LIB}/libutilscallstack.so,VNDK-SP-Private,
+/system/${LIB}/libutilscallstack.so,VNDK-SP,
 /system/${LIB}/libvintf.so,FWK-ONLY,
 /system/${LIB}/libvixl-arm.so,VNDK,
 /system/${LIB}/libvixl-arm64.so,VNDK,
@@ -464,7 +467,7 @@ Path,Tag,Comments
 /system/${LIB}/libvixld-arm64.so,FWK-ONLY,
 /system/${LIB}/libvndksupport.so,LL-NDK,
 /system/${LIB}/libvorbisidec.so,VNDK,
-/system/${LIB}/libvulkan.so,FWK-ONLY,
+/system/${LIB}/libvulkan.so,LL-NDK,
 /system/${LIB}/libwebviewchromium_loader.so,FWK-ONLY,
 /system/${LIB}/libwebviewchromium_plat_support.so,FWK-ONLY,
 /system/${LIB}/libwfds.so,FWK-ONLY,
@@ -486,6 +489,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@2.0-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@2.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@4.0-util.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.common@4.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.effect@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.audio.effect@4.0.so,VNDK,
@@ -496,6 +500,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.automotive.vehicle@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -581,6 +586,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.system.net.netd@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.system.net.netd@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.system.wifi.keystore@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libadf.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libaudioroute.so,VNDK,
@@ -715,7 +721,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwind.so,VNDK-SP-Private,
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libutils.so,VNDK-SP,
-/system/${LIB}/vndk-sp${VNDK_VER}/libutilscallstack.so,VNDK-SP-Private,
+/system/${LIB}/vndk-sp${VNDK_VER}/libutilscallstack.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libz.so,VNDK-SP,
 /vendor/${LIB}/hidl.tests.vendor@1.0.so,VND-ONLY,
 /vendor/${LIB}/hidl.tests.vendor@1.1.so,VND-ONLY,