diff --git a/apps/Fallback/res/values-pa/strings.xml b/apps/Fallback/res/values-pa/strings.xml
index d358b1e..8b6c250 100644
--- a/apps/Fallback/res/values-pa/strings.xml
+++ b/apps/Fallback/res/values-pa/strings.xml
@@ -17,6 +17,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="appTitle" msgid="161410001913116606">"ਪਿੱਛੇ ਜਾਓ"</string>
-    <string name="title" msgid="8156274565006125136">"ਅਸਮਰਥਿਤ ਕਿਰਿਆ"</string>
-    <string name="error" msgid="6539615832923362301">"ਉਹ ਕਿਰਿਆ ਇਸ ਵੇਲੇ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
+    <string name="title" msgid="8156274565006125136">"ਅਸਮਰਥਿਤ ਕਾਰਵਾਈ"</string>
+    <string name="error" msgid="6539615832923362301">"ਉਹ ਕਾਰਵਾਈ ਇਸ ਵੇਲੇ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
 </resources>
diff --git a/build/Android.mk b/build/Android.mk
index c1f503e..7e11d56 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -103,6 +103,9 @@
 # org.apache.http.legacy.jar stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar
 
+# shrinkedAndroid.jar for multidex support
+ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
+
 # $(1): the Java library name
 define _package_sdk_library
 $(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/javalib.jar)
diff --git a/build/sdk.atree b/build/sdk.atree
index 7c8b63c..5000e37 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -140,9 +140,9 @@
 bin/dexdump                                   build-tools/${PLATFORM_NAME}/dexdump
 
 # multi-dex
-prebuilts/sdk/tools/lib/shrinkedAndroid.jar   build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
-dalvik/dx/etc/mainDexClasses.rules            build-tools/${PLATFORM_NAME}/mainDexClasses.rules
-dalvik/dx/etc/mainDexClassesNoAapt.rules      build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
+${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar  build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
+dalvik/dx/etc/mainDexClasses.rules                                                           build-tools/${PLATFORM_NAME}/mainDexClasses.rules
+dalvik/dx/etc/mainDexClassesNoAapt.rules                                                     build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
 
 # Jack & Jill
 prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar                build-tools/${PLATFORM_NAME}/jack.jar
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index f043706..02d26a7 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,3 @@
 Pkg.UserSrc=false
 Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
-#Pkg.Revision=26.0.0 rc1
-
+#Pkg.Revision=26.0.3
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 6b09398..fa74c18 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=26.0.0 rc1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+#Pkg.Revision=26.0.0 rc1
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 0093ab1..35a00af 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=2
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=15
diff --git a/vndk/tools/definition-tool/datasets/eligible-list-o-mr1-release.csv b/vndk/tools/definition-tool/datasets/eligible-list-o-mr1-release.csv
index 7fa90fe..f18c760 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-o-mr1-release.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-o-mr1-release.csv
@@ -1,4 +1,4 @@
-Path,Tag,v3.7
+Path,Tag,Comments
 /system/${LIB}/android.frameworks.displayservice@1.0.so,VNDK,
 /system/${LIB}/android.frameworks.schedulerservice@1.0.so,VNDK,
 /system/${LIB}/android.frameworks.sensorservice@1.0.so,VNDK,
@@ -9,7 +9,6 @@
 /system/${LIB}/android.hardware.audio@2.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.vehicle@2.0.so,VNDK,
-/system/${LIB}/android.hardware.automotive.vehicle@2.1.so,VNDK,
 /system/${LIB}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/android.hardware.boot@1.0.so,VNDK,
@@ -18,13 +17,13 @@
 /system/${LIB}/android.hardware.camera.common@1.0.so,VNDK,
 /system/${LIB}/android.hardware.camera.device@1.0.so,VNDK,
 /system/${LIB}/android.hardware.camera.device@3.2.so,VNDK,
+/system/${LIB}/android.hardware.camera.device@3.3.so,VNDK,
 /system/${LIB}/android.hardware.camera.metadata@3.2.so,VNDK,
 /system/${LIB}/android.hardware.camera.provider@2.4.so,VNDK,
 /system/${LIB}/android.hardware.cas.native@1.0.so,VNDK,
 /system/${LIB}/android.hardware.cas@1.0.so,VNDK,
 /system/${LIB}/android.hardware.configstore-utils.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.0.so,VNDK,
-/system/${LIB}/android.hardware.configstore@1.1.so,VNDK,
 /system/${LIB}/android.hardware.contexthub@1.0.so,VNDK,
 /system/${LIB}/android.hardware.drm@1.0.so,VNDK,
 /system/${LIB}/android.hardware.dumpstate@1.0.so,VNDK,
@@ -53,18 +52,7 @@
 /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.bar@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.baz@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.expression@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.extension.light@2.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.foo@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.hash@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.inheritance@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tests.libhwbinder@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.memory@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.msgq@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.multithread@1.0.so,VNDK,
-/system/${LIB}/android.hardware.tests.pointer@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,
@@ -82,6 +70,7 @@
 /system/${LIB}/android.hardware.wifi@1.0.so,VNDK,
 /system/${LIB}/android.hardware.wifi@1.1.so,VNDK,
 /system/${LIB}/android.hidl.allocator@1.0.so,VNDK,
+/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,
@@ -101,7 +90,7 @@
 /system/${LIB}/libLLVM.so,FWK-ONLY,
 /system/${LIB}/libOpenMAXAL.so,FWK-ONLY,
 /system/${LIB}/libOpenSLES.so,FWK-ONLY,
-/system/${LIB}/libRS.so,FWK-ONLY,
+/system/${LIB}/libRS.so,LL-NDK,
 /system/${LIB}/libRSCpuRef.so,VNDK-SP,
 /system/${LIB}/libRSDriver.so,VNDK-SP,
 /system/${LIB}/libRS_internal.so,VNDK-SP,
@@ -109,6 +98,7 @@
 /system/${LIB}/libWnnEngDic.so,FWK-ONLY,
 /system/${LIB}/libWnnJpnDic.so,FWK-ONLY,
 /system/${LIB}/libaaudio.so,FWK-ONLY,
+/system/${LIB}/libadf.so,VNDK,
 /system/${LIB}/libandroid.so,FWK-ONLY,
 /system/${LIB}/libandroid_net.so,LL-NDK,
 /system/${LIB}/libandroid_runtime.so,FWK-ONLY,
@@ -132,7 +122,7 @@
 /system/${LIB}/libaudioroute.so,VNDK,
 /system/${LIB}/libaudiospdif.so,FWK-ONLY,
 /system/${LIB}/libaudioutils.so,VNDK,
-/system/${LIB}/libavservices_minijail.so,VNDK,
+/system/${LIB}/libavservices_minijail.so,FWK-ONLY,"Vendor module should link libavservices_minijail_vendor.so"
 /system/${LIB}/libbacktrace.so,VNDK-SP-Indirect,
 /system/${LIB}/libbase.so,VNDK-SP,
 /system/${LIB}/libbatteryservice.so,FWK-ONLY,
@@ -204,8 +194,8 @@
 /system/${LIB}/libhidltransport.so,VNDK-SP,
 /system/${LIB}/libhwbinder.so,VNDK-SP,
 /system/${LIB}/libhwui.so,FWK-ONLY,
-/system/${LIB}/libicui18n.so,VNDK,
-/system/${LIB}/libicuuc.so,VNDK,
+/system/${LIB}/libicui18n.so,FWK-ONLY,
+/system/${LIB}/libicuuc.so,FWK-ONLY,
 /system/${LIB}/libimg_utils.so,FWK-ONLY,
 /system/${LIB}/libincident.so,FWK-ONLY,
 /system/${LIB}/libinput.so,FWK-ONLY,
@@ -253,14 +243,14 @@
 /system/${LIB}/libmemunreachable.so,FWK-ONLY,
 /system/${LIB}/libmetricslogger.so,FWK-ONLY,
 /system/${LIB}/libmidi.so,FWK-ONLY,
-/system/${LIB}/libminijail.so,VNDK,
+/system/${LIB}/libminijail.so,FWK-ONLY,"Vendor module should link libminijail_vendor.so"
 /system/${LIB}/libminikin.so,FWK-ONLY,
 /system/${LIB}/libmtp.so,FWK-ONLY,
 /system/${LIB}/libnativebridge.so,FWK-ONLY,
 /system/${LIB}/libnativehelper.so,FWK-ONLY,
 /system/${LIB}/libnativeloader.so,FWK-ONLY,
 /system/${LIB}/libnativewindow.so,SP-NDK,
-/system/${LIB}/libnbaio.so,FWK-ONLY,
+/system/${LIB}/libnbaio.so,FWK-ONLY,"Vendor module should link libnbaio_mono.so"
 /system/${LIB}/libnetd_client.so,LL-NDK-Indirect,
 /system/${LIB}/libnetdaidl.so,FWK-ONLY,
 /system/${LIB}/libnetlink.so,FWK-ONLY,
@@ -317,6 +307,7 @@
 /system/${LIB}/libstagefright_foundation.so,VNDK,
 /system/${LIB}/libstagefright_http_support.so,FWK-ONLY,
 /system/${LIB}/libstagefright_omx.so,VNDK,
+/system/${LIB}/libstagefright_omx_utils.so,VNDK,
 /system/${LIB}/libstagefright_soft_aacdec.so,VNDK,
 /system/${LIB}/libstagefright_soft_aacenc.so,VNDK,
 /system/${LIB}/libstagefright_soft_amrdec.so,VNDK,
@@ -339,7 +330,7 @@
 /system/${LIB}/libstagefright_soft_vpxdec.so,VNDK,
 /system/${LIB}/libstagefright_soft_vpxenc.so,VNDK,
 /system/${LIB}/libstagefright_xmlparser.so,VNDK,
-/system/${LIB}/libstdc++.so,LL-NDK,
+/system/${LIB}/libstdc++.so,FWK-ONLY,
 /system/${LIB}/libsurfaceflinger.so,FWK-ONLY,
 /system/${LIB}/libsurfaceflinger_ddmconnection.so,FWK-ONLY,
 /system/${LIB}/libsuspend.so,VNDK,
@@ -350,7 +341,7 @@
 /system/${LIB}/libtinyxml2.so,VNDK,
 /system/${LIB}/libui.so,VNDK,
 /system/${LIB}/libunwind.so,VNDK-SP-Indirect,
-/system/${LIB}/libunwindstack.so,VNDK,
+/system/${LIB}/libunwindstack.so,VNDK-SP-Indirect,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
 /system/${LIB}/libvintf.so,FWK-ONLY,
@@ -370,7 +361,7 @@
 /system/${LIB}/libwnndict.so,FWK-ONLY,
 /system/${LIB}/libxml2.so,VNDK,
 /system/${LIB}/libyuv.so,VNDK,
-/system/${LIB}/libz.so,LL-NDK-Indirect,
+/system/${LIB}/libz.so,VNDK-SP,
 /system/${LIB}/libziparchive.so,VNDK,
 /system/${LIB}/tests.vendor@1.0.so,VNDK,
 /system/${LIB}/tests.vendor@1.1.so,VNDK,
@@ -380,7 +371,6 @@
 /system/${LIB}/vndk-sp/android.hardware.renderscript@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/libRS.so,VNDK-SP,
 /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,
@@ -412,7 +402,6 @@
 /system/${LIB}/vndk/android.hardware.audio@2.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.automotive.vehicle@2.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.automotive.vehicle@2.1.so,VNDK,
 /system/${LIB}/vndk/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
 /system/${LIB}/vndk/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.boot@1.0.so,VNDK,
@@ -421,13 +410,13 @@
 /system/${LIB}/vndk/android.hardware.camera.common@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.camera.device@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.camera.device@3.2.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.device@3.3.so,VNDK,
 /system/${LIB}/vndk/android.hardware.camera.metadata@3.2.so,VNDK,
 /system/${LIB}/vndk/android.hardware.camera.provider@2.4.so,VNDK,
 /system/${LIB}/vndk/android.hardware.cas.native@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.cas@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.configstore-utils.so,VNDK,
 /system/${LIB}/vndk/android.hardware.configstore@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.configstore@1.1.so,VNDK,
 /system/${LIB}/vndk/android.hardware.contexthub@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.drm@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.dumpstate@1.0.so,VNDK,
@@ -452,18 +441,7 @@
 /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.bar@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.baz@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.expression@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.extension.light@2.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.foo@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.hash@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.inheritance@1.0.so,VNDK,
 /system/${LIB}/vndk/android.hardware.tests.libhwbinder@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.memory@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.msgq@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.multithread@1.0.so,VNDK,
-/system/${LIB}/vndk/android.hardware.tests.pointer@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,
@@ -485,11 +463,9 @@
 /system/${LIB}/vndk/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/vndk/android.system.net.netd@1.0.so,VNDK,
 /system/${LIB}/vndk/android.system.wifi.keystore@1.0.so,VNDK,
-/system/${LIB}/vndk/libEGL.so,SP-NDK,
-/system/${LIB}/vndk/libGLESv2.so,SP-NDK,
+/system/${LIB}/vndk/libadf.so,VNDK,
 /system/${LIB}/vndk/libaudioroute.so,VNDK,
 /system/${LIB}/vndk/libaudioutils.so,VNDK,
-/system/${LIB}/vndk/libavservices_minijail.so,VNDK,
 /system/${LIB}/vndk/libbinder.so,VNDK,
 /system/${LIB}/vndk/libcamera_metadata.so,VNDK,
 /system/${LIB}/vndk/libcap.so,VNDK,
@@ -511,8 +487,6 @@
 /system/${LIB}/vndk/libgatekeeper.so,VNDK,
 /system/${LIB}/vndk/libgui.so,VNDK,
 /system/${LIB}/vndk/libhardware_legacy.so,VNDK,
-/system/${LIB}/vndk/libicui18n.so,VNDK,
-/system/${LIB}/vndk/libicuuc.so,VNDK,
 /system/${LIB}/vndk/libjpeg.so,VNDK,
 /system/${LIB}/vndk/libkeymaster_messages.so,VNDK,
 /system/${LIB}/vndk/libkeymaster_portable.so,VNDK,
@@ -523,7 +497,6 @@
 /system/${LIB}/vndk/libmedia_helper.so,VNDK,
 /system/${LIB}/vndk/libmedia_omx.so,VNDK,
 /system/${LIB}/vndk/libmemtrack.so,VNDK,
-/system/${LIB}/vndk/libminijail.so,VNDK,
 /system/${LIB}/vndk/libnetutils.so,VNDK,
 /system/${LIB}/vndk/libnl.so,VNDK,
 /system/${LIB}/vndk/libopus.so,VNDK,
@@ -545,6 +518,7 @@
 /system/${LIB}/vndk/libstagefright_flacdec.so,VNDK,
 /system/${LIB}/vndk/libstagefright_foundation.so,VNDK,
 /system/${LIB}/vndk/libstagefright_omx.so,VNDK,
+/system/${LIB}/vndk/libstagefright_omx_utils.so,VNDK,
 /system/${LIB}/vndk/libstagefright_soft_aacdec.so,VNDK,
 /system/${LIB}/vndk/libstagefright_soft_aacenc.so,VNDK,
 /system/${LIB}/vndk/libstagefright_soft_amrdec.so,VNDK,
@@ -568,7 +542,6 @@
 /system/${LIB}/vndk/libstagefright_soft_vpxenc.so,VNDK,
 /system/${LIB}/vndk/libstagefright_xmlparser.so,VNDK,
 /system/${LIB}/vndk/libsuspend.so,VNDK,
-/system/${LIB}/vndk/libsync.so,SP-NDK,
 /system/${LIB}/vndk/libsysutils.so,VNDK,
 /system/${LIB}/vndk/libtinyalsa.so,VNDK,
 /system/${LIB}/vndk/libtinyxml2.so,VNDK,
@@ -583,9 +556,11 @@
 /system/${LIB}/vndk/libziparchive.so,VNDK,
 /system/${LIB}/vndk/tests.vendor@1.0.so,VNDK,
 /system/${LIB}/vndk/tests.vendor@1.1.so,VNDK,
+/vendor/${LIB}/libavservices_minijail_vendor.so,VND-ONLY,Framework module should link libavservices_minijail.so
 /vendor/${LIB}/libcld80211.so,VND-ONLY,
 /vendor/${LIB}/libeffects.so,VND-ONLY,
 /vendor/${LIB}/libhwc2on1adapter.so,VND-ONLY,
+/vendor/${LIB}/libminijail_vendor.so,VND-ONLY,Framework module should link libminijail.so
 /vendor/${LIB}/libnbaio_mono.so,VND-ONLY,
 /vendor/${LIB}/libreference-ril.so,VND-ONLY,
 /vendor/${LIB}/libril.so,VND-ONLY,
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 47854d4..fd1fb75 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
@@ -1,15 +1,14 @@
-Path,Tag,v3.7
+Path,Tag,Comments
+/system/${LIB}/android.frameworks.displayservice@1.0.so,VNDK,
 /system/${LIB}/android.frameworks.schedulerservice@1.0.so,VNDK,
 /system/${LIB}/android.frameworks.sensorservice@1.0.so,VNDK,
 /system/${LIB}/android.frameworks.vr.composer@1.0.so,VNDK,
-/system/${LIB}/android.frameworks.vr.composer@1.0.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.effect@2.0.so,VNDK,
 /system/${LIB}/android.hardware.audio@2.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.evs@1.0.so,VNDK,
 /system/${LIB}/android.hardware.automotive.vehicle@2.0.so,VNDK,
-/system/${LIB}/android.hardware.automotive.vehicle@2.1.so,VNDK,
 /system/${LIB}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/android.hardware.boot@1.0.so,VNDK,
@@ -18,12 +17,10 @@
 /system/${LIB}/android.hardware.camera.common@1.0.so,VNDK,
 /system/${LIB}/android.hardware.camera.device@1.0.so,VNDK,
 /system/${LIB}/android.hardware.camera.device@3.2.so,VNDK,
+/system/${LIB}/android.hardware.camera.metadata@3.2.so,VNDK,
 /system/${LIB}/android.hardware.camera.provider@2.4.so,VNDK,
-/system/${LIB}/android.hardware.cas.native@1.0.so,VNDK,
-/system/${LIB}/android.hardware.cas@1.0.so,VNDK,
 /system/${LIB}/android.hardware.configstore-utils.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.0.so,VNDK,
-/system/${LIB}/android.hardware.configstore@1.1.so,VNDK,
 /system/${LIB}/android.hardware.contexthub@1.0.so,VNDK,
 /system/${LIB}/android.hardware.drm@1.0.so,VNDK,
 /system/${LIB}/android.hardware.dumpstate@1.0.so,VNDK,
@@ -42,9 +39,7 @@
 /system/${LIB}/android.hardware.media@1.0.so,VNDK,
 /system/${LIB}/android.hardware.memtrack@1.0.so,VNDK,
 /system/${LIB}/android.hardware.nfc@1.0.so,VNDK,
-/system/${LIB}/android.hardware.oemlock@1.0.so,VNDK,
 /system/${LIB}/android.hardware.power@1.0.so,VNDK,
-/system/${LIB}/android.hardware.power@1.1.so,VNDK,
 /system/${LIB}/android.hardware.radio.deprecated@1.0.so,VNDK,
 /system/${LIB}/android.hardware.radio@1.0.so,VNDK,
 /system/${LIB}/android.hardware.radio@1.1.so,VNDK,
@@ -58,18 +53,13 @@
 /system/${LIB}/android.hardware.tv.cec@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tv.input@1.0.so,VNDK,
 /system/${LIB}/android.hardware.usb@1.0.so,VNDK,
-/system/${LIB}/android.hardware.usb@1.1.so,VNDK,
 /system/${LIB}/android.hardware.vibrator@1.0.so,VNDK,
-/system/${LIB}/android.hardware.vibrator@1.1.so,VNDK,
 /system/${LIB}/android.hardware.vr@1.0.so,VNDK,
-/system/${LIB}/android.hardware.weaver@1.0.so,VNDK,
-/system/${LIB}/android.hardware.wifi.offload@1.0.so,VNDK,
 /system/${LIB}/android.hardware.wifi.supplicant@1.0.so,VNDK,
 /system/${LIB}/android.hardware.wifi@1.0.so,VNDK,
-/system/${LIB}/android.hardware.wifi@1.1.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.manager@1.0.so,VNDK,
+/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,
@@ -83,14 +73,11 @@
 /system/${LIB}/libETC1.so,FWK-ONLY,
 /system/${LIB}/libFFTEm.so,FWK-ONLY,
 /system/${LIB}/libGLESv1_CM.so,SP-NDK,
-/system/${LIB}/libGLESv1_enc.so,FWK-ONLY,
 /system/${LIB}/libGLESv2.so,SP-NDK,
-/system/${LIB}/libGLESv2_enc.so,FWK-ONLY,
 /system/${LIB}/libGLESv3.so,SP-NDK,
-/system/${LIB}/libLLVM.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/libLLVM.so,FWK-ONLY,
 /system/${LIB}/libOpenMAXAL.so,FWK-ONLY,
 /system/${LIB}/libOpenSLES.so,FWK-ONLY,
-/system/${LIB}/libOpenglSystemCommon.so,FWK-ONLY,
 /system/${LIB}/libRS.so,FWK-ONLY,
 /system/${LIB}/libRSCpuRef.so,VNDK-SP,
 /system/${LIB}/libRSDriver.so,VNDK-SP,
@@ -98,7 +85,6 @@
 /system/${LIB}/libRScpp.so,FWK-ONLY,
 /system/${LIB}/libWnnEngDic.so,FWK-ONLY,
 /system/${LIB}/libWnnJpnDic.so,FWK-ONLY,
-/system/${LIB}/lib_renderControl_enc.so,FWK-ONLY,
 /system/${LIB}/libaaudio.so,FWK-ONLY,
 /system/${LIB}/libandroid.so,FWK-ONLY,
 /system/${LIB}/libandroid_net.so,LL-NDK,
@@ -123,7 +109,7 @@
 /system/${LIB}/libaudioroute.so,VNDK,
 /system/${LIB}/libaudiospdif.so,FWK-ONLY,
 /system/${LIB}/libaudioutils.so,VNDK,
-/system/${LIB}/libavservices_minijail.so,VNDK,
+/system/${LIB}/libavservices_minijail.so,VNDK,"Will be FWK-ONLY in the future.  Vendor module should link libavservices_minijail_vendor.so"
 /system/${LIB}/libbacktrace.so,VNDK-SP-Indirect,
 /system/${LIB}/libbase.so,VNDK-SP,
 /system/${LIB}/libbatteryservice.so,FWK-ONLY,
@@ -145,7 +131,12 @@
 /system/${LIB}/libcameraservice.so,FWK-ONLY,
 /system/${LIB}/libcap.so,VNDK,
 /system/${LIB}/libchrome.so,FWK-ONLY,
-/system/${LIB}/libcld80211.so,VND-ONLY,
+/system/${LIB}/libclang_rt.ubsan_standalone-aarch64-android.so,VNDK,
+/system/${LIB}/libclang_rt.ubsan_standalone-arm-android.so,VNDK,
+/system/${LIB}/libclang_rt.ubsan_standalone-i686-android.so,VNDK,
+/system/${LIB}/libclang_rt.ubsan_standalone-mips-android.so,VNDK,
+/system/${LIB}/libclang_rt.ubsan_standalone-mips64-android.so,VNDK,
+/system/${LIB}/libclang_rt.ubsan_standalone-x86_64-android.so,VNDK,
 /system/${LIB}/libcompiler_rt.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/libcrypto.so,VNDK,
 /system/${LIB}/libcrypto_utils.so,VNDK,
@@ -161,7 +152,6 @@
 /system/${LIB}/libdrmframework_jni.so,FWK-ONLY,
 /system/${LIB}/libdumpstateaidl.so,FWK-ONLY,
 /system/${LIB}/libdumpstateutil.so,VNDK,
-/system/${LIB}/libeffects.so,FWK-ONLY,
 /system/${LIB}/libevent.so,VNDK,
 /system/${LIB}/libexif.so,VNDK,
 /system/${LIB}/libexpat.so,VNDK,
@@ -190,17 +180,15 @@
 /system/${LIB}/libhidlmemory.so,VNDK-SP,
 /system/${LIB}/libhidltransport.so,VNDK-SP,
 /system/${LIB}/libhwbinder.so,VNDK-SP,
-/system/${LIB}/libhwc2on1adapter.so,VND-ONLY,
 /system/${LIB}/libhwui.so,FWK-ONLY,
-/system/${LIB}/libicui18n.so,VNDK,
-/system/${LIB}/libicuuc.so,VNDK,
+/system/${LIB}/libicui18n.so,VNDK,Will be FWK-ONLY in the future
+/system/${LIB}/libicuuc.so,VNDK,Will be FWK-ONLY in the future
 /system/${LIB}/libimg_utils.so,FWK-ONLY,
 /system/${LIB}/libincident.so,FWK-ONLY,
 /system/${LIB}/libinput.so,FWK-ONLY,
 /system/${LIB}/libinputflinger.so,FWK-ONLY,
 /system/${LIB}/libinputservice.so,FWK-ONLY,
 /system/${LIB}/libion.so,VNDK-SP,
-/system/${LIB}/libiperf.so,FWK-ONLY,
 /system/${LIB}/libiprouteutil.so,FWK-ONLY,
 /system/${LIB}/libjavacore.so,FWK-ONLY,
 /system/${LIB}/libjavacrypto.so,FWK-ONLY,
@@ -215,8 +203,6 @@
 /system/${LIB}/libjpeg.so,VNDK,
 /system/${LIB}/libkeymaster1.so,VNDK,
 /system/${LIB}/libkeymaster_messages.so,VNDK,
-/system/${LIB}/libkeymaster_portable.so,VNDK,
-/system/${LIB}/libkeymaster_staging.so,VNDK,
 /system/${LIB}/libkeystore-engine.so,FWK-ONLY,
 /system/${LIB}/libkeystore_binder.so,FWK-ONLY,
 /system/${LIB}/libldacBT_abr.so,VNDK,
@@ -242,14 +228,14 @@
 /system/${LIB}/libmemunreachable.so,FWK-ONLY,
 /system/${LIB}/libmetricslogger.so,FWK-ONLY,
 /system/${LIB}/libmidi.so,FWK-ONLY,
-/system/${LIB}/libminijail.so,VNDK,
+/system/${LIB}/libminijail.so,VNDK,"Will be FWK-ONLY in the future.  Vendor module should link libminijail_vendor.so"
 /system/${LIB}/libminikin.so,FWK-ONLY,
 /system/${LIB}/libmtp.so,FWK-ONLY,
 /system/${LIB}/libnativebridge.so,FWK-ONLY,
 /system/${LIB}/libnativehelper.so,FWK-ONLY,
 /system/${LIB}/libnativeloader.so,FWK-ONLY,
 /system/${LIB}/libnativewindow.so,SP-NDK,
-/system/${LIB}/libnbaio.so,VNDK,
+/system/${LIB}/libnbaio.so,VNDK,"Vendor modules should use libnbaio_mono.so (with less APIs) in the future"
 /system/${LIB}/libnetd_client.so,LL-NDK-Indirect,
 /system/${LIB}/libnetdaidl.so,FWK-ONLY,
 /system/${LIB}/libnetlink.so,FWK-ONLY,
@@ -279,9 +265,6 @@
 /system/${LIB}/libradio.so,FWK-ONLY,
 /system/${LIB}/libradio_metadata.so,VNDK,
 /system/${LIB}/libradioservice.so,FWK-ONLY,
-/system/${LIB}/libreference-ril.so,VND-ONLY,
-/system/${LIB}/libril.so,VND-ONLY,
-/system/${LIB}/librilutils.so,VND-ONLY,
 /system/${LIB}/librs_jni.so,FWK-ONLY,
 /system/${LIB}/librtp_jni.so,FWK-ONLY,
 /system/${LIB}/libschedulerservicehidl.so,FWK-ONLY,
@@ -339,10 +322,10 @@
 /system/${LIB}/libsysutils.so,VNDK,
 /system/${LIB}/libtextclassifier.so,FWK-ONLY,
 /system/${LIB}/libtinyalsa.so,VNDK,
-/system/${LIB}/libtinycompress.so,VND-ONLY,
 /system/${LIB}/libtinyxml2.so,VNDK,
 /system/${LIB}/libui.so,VNDK,
 /system/${LIB}/libunwind.so,VNDK-SP-Indirect,
+/system/${LIB}/libunwindstack.so,VNDK-SP-Indirect,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
 /system/${LIB}/libvintf.so,FWK-ONLY,
@@ -351,12 +334,11 @@
 /system/${LIB}/libvndksupport.so,LL-NDK,
 /system/${LIB}/libvorbisidec.so,FWK-ONLY,
 /system/${LIB}/libvulkan.so,SP-NDK,
-/system/${LIB}/libwebrtc_audio_preprocessing.so,VND-ONLY,
+/system/${LIB}/libwebrtc_audio_preprocessing.so,VND-ONLY,This will be moved to vendor partition
 /system/${LIB}/libwebviewchromium_loader.so,FWK-ONLY,
 /system/${LIB}/libwebviewchromium_plat_support.so,FWK-ONLY,
 /system/${LIB}/libwfds.so,FWK-ONLY,
 /system/${LIB}/libwifi-service.so,FWK-ONLY,
-/system/${LIB}/libwifi-system-iface.so,VNDK,
 /system/${LIB}/libwifi-system.so,FWK-ONLY,
 /system/${LIB}/libwifikeystorehal.so,FWK-ONLY,
 /system/${LIB}/libwilhelm.so,FWK-ONLY,
@@ -365,13 +347,6 @@
 /system/${LIB}/libyuv.so,VNDK,
 /system/${LIB}/libz.so,LL-NDK,
 /system/${LIB}/libziparchive.so,VNDK,
-/system/${LIB}/soundfx/libaudiopreprocessing.so,FWK-ONLY,
-/system/${LIB}/soundfx/libbundlewrapper.so,FWK-ONLY,
-/system/${LIB}/soundfx/libdownmix.so,FWK-ONLY,
-/system/${LIB}/soundfx/libeffectproxy.so,FWK-ONLY,
-/system/${LIB}/soundfx/libldnhncr.so,FWK-ONLY,
-/system/${LIB}/soundfx/libreverbwrapper.so,FWK-ONLY,
-/system/${LIB}/soundfx/libvisualizer.so,FWK-ONLY,
 /system/${LIB}/vndk-sp/android.hardware.graphics.allocator@2.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp/android.hardware.graphics.common@1.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
@@ -379,7 +354,6 @@
 /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/libLLVM.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,
@@ -398,10 +372,136 @@
 /system/${LIB}/vndk-sp/libion.so,VNDK-SP,
 /system/${LIB}/vndk-sp/liblzma.so,VNDK-SP-Indirect,
 /system/${LIB}/vndk-sp/libunwind.so,VNDK-SP-Indirect,
+/system/${LIB}/vndk-sp/libunwindstack.so,VNDK-SP-Indirect,
 /system/${LIB}/vndk-sp/libutils.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libz.so,VNDK-SP,
+/system/${LIB}/vndk/android.frameworks.displayservice@1.0.so,VNDK,
+/system/${LIB}/vndk/android.frameworks.schedulerservice@1.0.so,VNDK,
+/system/${LIB}/vndk/android.frameworks.sensorservice@1.0.so,VNDK,
+/system/${LIB}/vndk/android.frameworks.vr.composer@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.audio.common@2.0-util.so,VNDK,
+/system/${LIB}/vndk/android.hardware.audio.common@2.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.audio.effect@2.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.audio@2.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.automotive.evs@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.automotive.vehicle@2.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
+/system/${LIB}/vndk/android.hardware.bluetooth@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.boot@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.broadcastradio@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.broadcastradio@1.1.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.common@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.device@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.device@3.2.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.metadata@3.2.so,VNDK,
+/system/${LIB}/vndk/android.hardware.camera.provider@2.4.so,VNDK,
+/system/${LIB}/vndk/android.hardware.configstore-utils.so,VNDK,
+/system/${LIB}/vndk/android.hardware.configstore@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.contexthub@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.drm@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.dumpstate@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.gatekeeper@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.gnss@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.graphics.bufferqueue@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.graphics.composer@2.1.so,VNDK,
+/system/${LIB}/vndk/android.hardware.health@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.ir@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.keymaster@3.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.light@2.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.media.omx@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.media@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.memtrack@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.nfc@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.power@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.radio.deprecated@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.radio@1.0.so,VNDK,
+/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,
+/system/${LIB}/vndk/android.hardware.tv.cec@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.tv.input@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.usb@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.vibrator@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.vr@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.wifi.supplicant@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hardware.wifi@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hidl.allocator@1.0.so,VNDK,
+/system/${LIB}/vndk/android.hidl.token@1.0-utils.so,VNDK,
+/system/${LIB}/vndk/android.hidl.token@1.0.so,VNDK,
+/system/${LIB}/vndk/android.system.wifi.keystore@1.0.so,VNDK,
+/system/${LIB}/vndk/libaudioroute.so,VNDK,
+/system/${LIB}/vndk/libaudioutils.so,VNDK,
+/system/${LIB}/vndk/libavservices_minijail.so,VNDK,"Will be FWK-ONLY in the future.  Vendor module should link libavservices_minijail_vendor.so"
+/system/${LIB}/vndk/libbinder.so,VNDK,
+/system/${LIB}/vndk/libcamera_metadata.so,VNDK,
+/system/${LIB}/vndk/libcap.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-aarch64-android.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-arm-android.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-i686-android.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-mips-android.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-mips64-android.so,VNDK,
+/system/${LIB}/vndk/libclang_rt.ubsan_standalone-x86_64-android.so,VNDK,
+/system/${LIB}/vndk/libcrypto.so,VNDK,
+/system/${LIB}/vndk/libcrypto_utils.so,VNDK,
+/system/${LIB}/vndk/libcurl.so,VNDK,
+/system/${LIB}/vndk/libdiskconfig.so,VNDK,
+/system/${LIB}/vndk/libdumpstateutil.so,VNDK,
+/system/${LIB}/vndk/libevent.so,VNDK,
+/system/${LIB}/vndk/libexif.so,VNDK,
+/system/${LIB}/vndk/libexpat.so,VNDK,
+/system/${LIB}/vndk/libfmq.so,VNDK,
+/system/${LIB}/vndk/libgatekeeper.so,VNDK,
+/system/${LIB}/vndk/libgui.so,VNDK,
+/system/${LIB}/vndk/libhardware_legacy.so,VNDK,
+/system/${LIB}/vndk/libicui18n.so,VNDK,Will be FWK-ONLY in the future
+/system/${LIB}/vndk/libicuuc.so,VNDK,Will be FWK-ONLY in the future
+/system/${LIB}/vndk/libjpeg.so,VNDK,
+/system/${LIB}/vndk/libkeymaster1.so,VNDK,
+/system/${LIB}/vndk/libkeymaster_messages.so,VNDK,
+/system/${LIB}/vndk/libldacBT_abr.so,VNDK,
+/system/${LIB}/vndk/libldacBT_enc.so,VNDK,
+/system/${LIB}/vndk/liblz4.so,VNDK,
+/system/${LIB}/vndk/libmedia_helper.so,VNDK,
+/system/${LIB}/vndk/libmedia_omx.so,VNDK,
+/system/${LIB}/vndk/libmemtrack.so,VNDK,
+/system/${LIB}/vndk/libminijail.so,VNDK,"Will be FWK-ONLY in the future.  Vendor module should link libminijail_vendor.so"
+/system/${LIB}/vndk/libnbaio.so,VNDK,"Vendor modules should use libnbaio_mono.so (with less APIs) in the future"
+/system/${LIB}/vndk/libnetutils.so,VNDK,
+/system/${LIB}/vndk/libnl.so,VNDK,
+/system/${LIB}/vndk/libpagemap.so,VNDK,
+/system/${LIB}/vndk/libpcre2.so,VNDK,
+/system/${LIB}/vndk/libpiex.so,VNDK,
+/system/${LIB}/vndk/libpng.so,VNDK,
+/system/${LIB}/vndk/libpower.so,VNDK,
+/system/${LIB}/vndk/libprocinfo.so,VNDK,
+/system/${LIB}/vndk/libprotobuf-cpp-full.so,VNDK,
+/system/${LIB}/vndk/libprotobuf-cpp-lite.so,VNDK,
+/system/${LIB}/vndk/libradio_metadata.so,VNDK,
+/system/${LIB}/vndk/libsoftkeymasterdevice.so,VNDK,
+/system/${LIB}/vndk/libspeexresampler.so,VNDK,
+/system/${LIB}/vndk/libsqlite.so,VNDK,
+/system/${LIB}/vndk/libssl.so,VNDK,
+/system/${LIB}/vndk/libstagefright_foundation.so,VNDK,
+/system/${LIB}/vndk/libstagefright_omx.so,VNDK,
+/system/${LIB}/vndk/libsuspend.so,VNDK,
+/system/${LIB}/vndk/libsysutils.so,VNDK,
+/system/${LIB}/vndk/libtinyalsa.so,VNDK,
+/system/${LIB}/vndk/libtinyxml2.so,VNDK,
+/system/${LIB}/vndk/libui.so,VNDK,
+/system/${LIB}/vndk/libusbhost.so,VNDK,
+/system/${LIB}/vndk/libvixl-arm.so,VNDK,
+/system/${LIB}/vndk/libvixl-arm64.so,VNDK,
+/system/${LIB}/vndk/libxml2.so,VNDK,
+/system/${LIB}/vndk/libyuv.so,VNDK,
+/system/${LIB}/vndk/libziparchive.so,VNDK,
+/vendor/${LIB}/libavservices_minijail_vendor.so,VND-ONLY,Framework module should link libavservices_minijail.so
 /vendor/${LIB}/libcld80211.so,VND-ONLY,
 /vendor/${LIB}/libhwc2on1adapter.so,VND-ONLY,
-/vendor/${LIB}/libnbaio_mono.so,VND-ONLY,
+/vendor/${LIB}/libminijail_vendor.so,VND-ONLY,Framework module should link libminijail.so
 /vendor/${LIB}/libreference-ril.so,VND-ONLY,
 /vendor/${LIB}/libril.so,VND-ONLY,
 /vendor/${LIB}/librilutils.so,VND-ONLY,