diff --git a/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv b/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
index fd1fb75..3c3159f 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
@@ -46,7 +46,6 @@
 /system/${LIB}/android.hardware.renderscript@1.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.sensors@1.0.so,VNDK,
 /system/${LIB}/android.hardware.soundtrigger@2.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.libhwbinder@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tetheroffload.config@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tetheroffload.control@1.0.so,VNDK,
 /system/${LIB}/android.hardware.thermal@1.0.so,VNDK,
@@ -59,12 +58,12 @@
 /system/${LIB}/android.hardware.wifi@1.0.so,VNDK,
 /system/${LIB}/android.hidl.allocator@1.0.so,VNDK,
 /system/${LIB}/android.hidl.base@1.0.so,VNDK-SP,
-/system/${LIB}/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/android.hidl.memory@1.0.so,VNDK-SP,
 /system/${LIB}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/android.system.wifi.keystore@1.0.so,VNDK,
 /system/${LIB}/drm/libfwdlockengine.so,FWK-ONLY,
+/system/${LIB}/hw/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/hw/audio.a2dp.default.so,FWK-ONLY,
 /system/${LIB}/hw/bluetooth.default.so,FWK-ONLY,
 /system/${LIB}/hw/keystore.default.so,FWK-ONLY,
@@ -352,8 +351,8 @@
 /system/${LIB}/vndk-sp/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp/android.hardware.renderscript@1.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp/android.hidl.base@1.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/vndk-sp/android.hidl.memory@1.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/hw/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/vndk-sp/libRSCpuRef.so,VNDK-SP,
 /system/${LIB}/vndk-sp/libRSDriver.so,VNDK-SP,
 /system/${LIB}/vndk-sp/libRS_internal.so,VNDK-SP,
@@ -418,7 +417,6 @@
 /system/${LIB}/vndk/android.hardware.radio@1.1.so,VNDK,
 /system/${LIB}/vndk/android.hardware.sensors@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.soundtrigger@2.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.libhwbinder@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.tetheroffload.config@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.tetheroffload.control@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.thermal@1.0.so,VNDK,