diff --git a/vndk/tools/definition-tool/tests/test_elf_linker.py b/vndk/tools/definition-tool/tests/test_elf_linker.py
index 68109f26f..d3eecdd1e 100755
--- a/vndk/tools/definition-tool/tests/test_elf_linker.py
+++ b/vndk/tools/definition-tool/tests/test_elf_linker.py
@@ -273,7 +273,6 @@ class ELFLinkerTest(unittest.TestCase):
             'libhidltransport',
             'libhwbinder',
             'libutils',
-            'libz',
         )
 
         # Add VNDK-SP libraries.
diff --git a/vndk/tools/definition-tool/tests/test_ndk_libs.py b/vndk/tools/definition-tool/tests/test_ndk_libs.py
index 976badccb..00a4c180c 100755
--- a/vndk/tools/definition-tool/tests/test_ndk_libs.py
+++ b/vndk/tools/definition-tool/tests/test_ndk_libs.py
@@ -19,6 +19,8 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libm.so'))
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libstdc++.so'))
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libvndksupport.so'))
+        self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libandroid_net.so'))
+        self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libz.so'))
 
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libc.so'))
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libdl.so'))
@@ -26,13 +28,11 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libm.so'))
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libstdc++.so'))
         self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libvndksupport.so'))
+        self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libandroid_net.so'))
+        self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libz.so'))
 
         self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libm'))
 
-        # libz.so is not LL-NDK anymore.
-        self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libz.so'))
-        self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib64/libz.so'))
-
     def test_is_sp_ndk(self):
         self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libEGL.so'))
         self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libGLESv1_CM.so'))
@@ -104,12 +104,18 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib/liblog.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libm.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libstdc++.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libvndksupport.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libandroid_net.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libz.so'))
 
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libc.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libdl.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/liblog.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libm.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libstdc++.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libvndksupport.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libandroid_net.so'))
+        self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libz.so'))
 
         # SP-NDK
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libEGL.so'))
@@ -139,10 +145,6 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libmediandk.so'))
         self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libvulkan.so'))
 
-        # libz.so is not NDK anymore.
-        self.assertFalse(NDK_LIBS.is_ndk('/system/lib/libz.so'))
-        self.assertFalse(NDK_LIBS.is_ndk('/system/lib64/libz.so'))
-
     def test_classify(self):
         self.assertEqual(NDK_LIBS.NOT_NDK,
                          NDK_LIBS.classify('/system/lib/libfoo.so'))
diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py
index 7ab84ae2e..6f83b9be9 100755
--- a/vndk/tools/definition-tool/vndk_definition_tool.py
+++ b/vndk/tools/definition-tool/vndk_definition_tool.py
@@ -542,6 +542,8 @@ class NDKLibDict(object):
         'libm.so',
         'libstdc++.so',
         'libvndksupport.so',
+        'libandroid_net.so',
+        'libz.so',
     )
 
     SP_NDK_LIB_NAMES = (
@@ -1124,7 +1126,6 @@ class ELFLinker(object):
             '^.*/libhidltransport\\.so$',
             '^.*/libhwbinder\\.so$',
             '^.*/libutils\\.so$',
-            '^.*/libz\\.so$',
 
             # Only for o-release
             '^.*/android\\.hidl\\.base@1\\.0\\.so$',