Change LTP tests' working directory am: 397ad17b3a am: cbb1e94e7c
am: 69b6fc464a

Change-Id: I2564863960da468572727aab330770536e750ee6
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..9d07715
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+yim@google.com
+trong@google.com
+yuexima@google.com
diff --git a/api/Android.mk b/api/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/api/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/api/binder/Android.mk b/api/binder/Android.mk
index e866f70..f117aa8 100644
--- a/api/binder/Android.mk
+++ b/api/binder/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelBinderTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/hwbinder/Android.mk b/api/hwbinder/Android.mk
index c9fcaf8..8a152ba 100644
--- a/api/hwbinder/Android.mk
+++ b/api/hwbinder/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelHwBinder
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/hwbinder/VtsKernelHwBinderTest.py b/api/hwbinder/VtsKernelHwBinderTest.py
index 8fd24e0..f038c0e 100644
--- a/api/hwbinder/VtsKernelHwBinderTest.py
+++ b/api/hwbinder/VtsKernelHwBinderTest.py
@@ -22,10 +22,11 @@
 from vts.runners.host import const
 from vts.runners.host import test_runner
 from vts.utils.python.controllers import android_device
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 HWBINDER_PATH = "/dev/hwbinder"
 
+
 class VtsKernelHwBinderTest(base_test.BaseTestClass):
     """Test case to validate existence of hwbinder node.
     """
@@ -41,16 +42,19 @@
         """
         logging.info("Testing existence of %s", HWBINDER_PATH)
         asserts.assertTrue(
-            file_utils.Exists(HWBINDER_PATH, self.shell),
+            target_file_utils.Exists(HWBINDER_PATH, self.shell),
             "%s: File does not exist." % HWBINDER_PATH)
 
         try:
-            permissions = file_utils.GetPermission(HWBINDER_PATH, self.shell)
-            asserts.assertTrue(file_utils.IsReadWrite(permissions),
-                               "%s: File has invalid permissions (%s)" %
-                               (HWBINDER_PATH, permissions))
+            permissions = target_file_utils.GetPermission(
+                HWBINDER_PATH, self.shell)
+            asserts.assertTrue(
+                target_file_utils.IsReadWrite(permissions),
+                "%s: File has invalid permissions (%s)" % (HWBINDER_PATH,
+                                                           permissions))
         except (ValueError, IOError) as e:
             asserts.fail("Failed to assert permissions: %s" % str(e))
 
+
 if __name__ == "__main__":
     test_runner.main()
diff --git a/api/libcutils/Android.mk b/api/libcutils/Android.mk
index 24254d9..fde6207 100644
--- a/api/libcutils/Android.mk
+++ b/api/libcutils/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLibcutilsTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/netd/Android.mk b/api/netd/Android.mk
index 757dffe..198df70 100644
--- a/api/netd/Android.mk
+++ b/api/netd/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelNetdTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/proc/Android.mk b/api/proc/Android.mk
index 81ae676..947fcd8 100644
--- a/api/proc/Android.mk
+++ b/api/proc/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := KernelProcFileApiTest
 VTS_CONFIG_SRC_DIR := testcases/kernel/api/proc
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/proc/KernelProcFileApiTest.py b/api/proc/KernelProcFileApiTest.py
index 7a11185..da9dc99 100644
--- a/api/proc/KernelProcFileApiTest.py
+++ b/api/proc/KernelProcFileApiTest.py
@@ -39,7 +39,7 @@
 from vts.testcases.kernel.api.proc import ProcZoneInfoTest
 
 from vts.utils.python.controllers import android_device
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 TEST_OBJECTS = {
     ProcCmdlineTest.ProcCmdlineTest(),
@@ -86,7 +86,7 @@
         asserts.skipIf(test_object in TEST_OBJECTS_64 and not self.dut.is64Bit,
                        "Skip test for 64-bit kernel.")
         filepath = test_object.get_path()
-        file_utils.assertPermissionsAndExistence(
+        target_file_utils.assertPermissionsAndExistence(
             self.shell, filepath, test_object.get_permission_checker())
 
         logging.info("Testing format of %s", filepath)
diff --git a/api/proc/KernelProcFileTestBase.py b/api/proc/KernelProcFileTestBase.py
index 0b0ed02..b276381 100644
--- a/api/proc/KernelProcFileTestBase.py
+++ b/api/proc/KernelProcFileTestBase.py
@@ -23,7 +23,7 @@
 from abc import abstractmethod
 from ply import lex
 from ply import yacc
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 def repeat_rule(to_repeat, zero_ok=False):
@@ -152,7 +152,8 @@
         """
         parsed = parse.parse(rule, line, custom)
         if parsed is None:
-            raise SyntaxError("Failed to parse line %s according to rule %s" % (line, rule))
+            raise SyntaxError("Failed to parse line %s according to rule %s" %
+                              (line, rule))
         return list(parsed)
 
     def parse_contents(self, file_contents):
@@ -200,11 +201,11 @@
         """Gets the function handle to use for validating file permissions.
 
         Return the function that will check if the permissions are correct.
-        By default, return the IsReadOnly function from file_utils.
+        By default, return the IsReadOnly function from target_file_utils.
 
         Returns:
             function which takes one argument (the unix file permission bits
             in octal format) and returns True if the permissions are correct,
             False otherwise.
         """
-        return file_utils.IsReadOnly
+        return target_file_utils.IsReadOnly
diff --git a/api/proc/ProcQtaguidCtrlTest.py b/api/proc/ProcQtaguidCtrlTest.py
index 3d395ef..7948d45 100644
--- a/api/proc/ProcQtaguidCtrlTest.py
+++ b/api/proc/ProcQtaguidCtrlTest.py
@@ -16,7 +16,7 @@
 
 from vts.testcases.kernel.api.proc import KernelProcFileTestBase
 from vts.testcases.kernel.api.proc.KernelProcFileTestBase import repeat_rule, literal_token
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class ProcQtaguidCtrlTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -55,4 +55,4 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
diff --git a/api/proc/ProcRemoveUidRangeTest.py b/api/proc/ProcRemoveUidRangeTest.py
index aeac742..b387ad7 100644
--- a/api/proc/ProcRemoveUidRangeTest.py
+++ b/api/proc/ProcRemoveUidRangeTest.py
@@ -16,7 +16,7 @@
 
 from vts.runners.host import const
 from vts.testcases.kernel.api.proc import KernelProcFileTestBase
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class ProcRemoveUidRangeTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -34,7 +34,7 @@
     def get_permission_checker(self):
         """Get write-only file permission checker.
         """
-        return file_utils.IsWriteOnly
+        return target_file_utils.IsWriteOnly
 
     def get_path(self):
         return '/proc/uid_cputime/remove_uid_range'
diff --git a/api/proc/ProcSimpleFileTests.py b/api/proc/ProcSimpleFileTests.py
index 507f9be..e2ae66a 100644
--- a/api/proc/ProcSimpleFileTests.py
+++ b/api/proc/ProcSimpleFileTests.py
@@ -16,7 +16,7 @@
 
 from vts.testcases.kernel.api.proc import KernelProcFileTestBase
 
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class ProcKptrRestrictTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -36,7 +36,7 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
 
 
 class ProcRandomizeVaSpaceTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -56,7 +56,7 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
 
 
 class ProcOverCommitMemoryTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -75,7 +75,7 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
 
 
 class ProcMmapMinAddrTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -91,7 +91,7 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
 
 
 class ProcMmapRndBitsTest(KernelProcFileTestBase.KernelProcFileTestBase):
@@ -111,7 +111,7 @@
     def get_permission_checker(self):
         """Get r/w file permission checker.
         """
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
 
 
 class ProcMmapRndCompatBitsTest(ProcMmapRndBitsTest):
diff --git a/api/proc/ProcVmallocInfoTest.py b/api/proc/ProcVmallocInfoTest.py
index bd1368a..bf0bff0 100644
--- a/api/proc/ProcVmallocInfoTest.py
+++ b/api/proc/ProcVmallocInfoTest.py
@@ -95,6 +95,7 @@
 
     def p_caller(self, p):
         '''caller : CALLER
+                  | HEX_LITERAL
                   | empty'''
         p[0] = p[1]
 
diff --git a/api/qtaguid/Android.mk b/api/qtaguid/Android.mk
index e4b56da..90e9a73 100644
--- a/api/qtaguid/Android.mk
+++ b/api/qtaguid/Android.mk
@@ -32,4 +32,4 @@
 
 LOCAL_MODULE := VtsQtaguidTest
 VTS_CONFIG_SRC_DIR := testcases/kernel/api/qtaguid
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/selinux/Android.mk b/api/selinux/Android.mk
index 244af93..0c50947 100644
--- a/api/selinux/Android.mk
+++ b/api/selinux/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelSelinuxFileApi
 VTS_CONFIG_SRC_DIR := testcases/kernel/api/selinux
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/selinux/KernelSelinuxFileTestBase.py b/api/selinux/KernelSelinuxFileTestBase.py
index d48e007..c7f8bab 100644
--- a/api/selinux/KernelSelinuxFileTestBase.py
+++ b/api/selinux/KernelSelinuxFileTestBase.py
@@ -17,7 +17,8 @@
 from abc import ABCMeta
 from abc import abstractmethod
 
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
+
 
 class KernelSelinuxFileTestBase(object):
     """Abstract test for the formatting of a selinux file.
@@ -50,11 +51,11 @@
         """Gets the function handle to use for validating file permissions.
 
         Return the function that will check if the permissions are correct.
-        By default, return the IsReadOnly function from file_utils.
+        By default, return the IsReadOnly function from target_file_utils.
 
         Returns:
             function which takes one argument (the unix file permission bits
             in octal format) and returns True if the permissions are correct,
             False otherwise.
         """
-        return file_utils.IsReadOnly
+        return target_file_utils.IsReadOnly
diff --git a/api/selinux/SelinuxCheckReqProtTest.py b/api/selinux/SelinuxCheckReqProtTest.py
index 5d091a5..0a8668b 100644
--- a/api/selinux/SelinuxCheckReqProtTest.py
+++ b/api/selinux/SelinuxCheckReqProtTest.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 from vts.testcases.kernel.api.selinux import KernelSelinuxFileTestBase
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class SelinuxCheckReqProt(KernelSelinuxFileTestBase.KernelSelinuxFileTestBase):
@@ -39,4 +39,4 @@
 
     def get_permission_checker(self):
         """Gets the function handle to validate r/w file permissions."""
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
diff --git a/api/selinux/SelinuxNullTest.py b/api/selinux/SelinuxNullTest.py
index 611e492..30c6ec9 100644
--- a/api/selinux/SelinuxNullTest.py
+++ b/api/selinux/SelinuxNullTest.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 from vts.testcases.kernel.api.selinux import KernelSelinuxFileTestBase
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class SelinuxNull(KernelSelinuxFileTestBase.KernelSelinuxFileTestBase):
@@ -28,4 +28,4 @@
 
     def get_permission_checker(self):
         """Gets the function handle to validate r/w file permissions."""
-        return file_utils.IsReadWrite
+        return target_file_utils.IsReadWrite
diff --git a/api/selinux/SelinuxPolicyTest.py b/api/selinux/SelinuxPolicyTest.py
index 9c79336..ca3e48f 100644
--- a/api/selinux/SelinuxPolicyTest.py
+++ b/api/selinux/SelinuxPolicyTest.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 from vts.testcases.kernel.api.selinux import KernelSelinuxFileTestBase
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class SelinuxPolicy(KernelSelinuxFileTestBase.KernelSelinuxFileTestBase):
diff --git a/api/selinux/VtsKernelSelinuxFileApiTest.py b/api/selinux/VtsKernelSelinuxFileApiTest.py
index d35e33b..95d8185 100644
--- a/api/selinux/VtsKernelSelinuxFileApiTest.py
+++ b/api/selinux/VtsKernelSelinuxFileApiTest.py
@@ -25,14 +25,14 @@
 from vts.testcases.kernel.api.selinux import SelinuxPolicyTest
 from vts.testcases.kernel.api.selinux import SelinuxNullTest
 from vts.utils.python.controllers import android_device
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 TEST_OBJECTS = {
     SelinuxCheckReqProtTest.SelinuxCheckReqProt(),
-    SelinuxPolicyTest.SelinuxPolicy(),
-    SelinuxNullTest.SelinuxNull()
+    SelinuxPolicyTest.SelinuxPolicy(), SelinuxNullTest.SelinuxNull()
 }
 
+
 class VtsKernelSelinuxFileApiTest(base_test.BaseTestClass):
     """Test cases which check content of selinuxfs files.
     """
@@ -52,30 +52,33 @@
         logging.info("Testing existence of %s" % (test_object.get_path()))
 
         asserts.assertTrue(
-            file_utils.Exists(test_object.get_path(), self.shell),
+            target_file_utils.Exists(test_object.get_path(), self.shell),
             "%s: File does not exist." % test_object.get_path())
 
         logging.info("Testing permissions of %s" % (test_object.get_path()))
         try:
-            permissions = file_utils.GetPermission(
+            permissions = target_file_utils.GetPermission(
                 test_object.get_path(), self.shell)
-            asserts.assertTrue(test_object.get_permission_checker()(permissions),
-                               "%s: File has invalid permissions (%s)" %
-                               (test_object.get_path(), permissions))
+            asserts.assertTrue(
+                test_object.get_permission_checker()(permissions),
+                "%s: File has invalid permissions (%s)" %
+                (test_object.get_path(), permissions))
         except (ValueError, IOError) as e:
             asserts.fail("Failed to assert permissions: %s" % str(e))
 
         logging.info("Testing format of %s" % (test_object.get_path()))
-        file_content = file_utils.ReadFileContent(
+        file_content = target_file_utils.ReadFileContent(
             test_object.get_path(), self.shell)
         asserts.assertTrue(
             test_object.result_correct(file_content), "Results not valid!")
 
     def generateProcFileTests(self):
         """Run all selinux file tests."""
-        self.runGeneratedTests(test_func=self.runSelinuxFileTest,
-                settings=TEST_OBJECTS,
-                name_func=lambda test_obj: "test" + test_obj.__class__.__name__)
+        self.runGeneratedTests(
+            test_func=self.runSelinuxFileTest,
+            settings=TEST_OBJECTS,
+            name_func=lambda test_obj: "test" + test_obj.__class__.__name__)
+
 
 if __name__ == "__main__":
     test_runner.main()
diff --git a/api/sysfs/Android.mk b/api/sysfs/Android.mk
index 78b6f0c..6871e46 100644
--- a/api/sysfs/Android.mk
+++ b/api/sysfs/Android.mk
@@ -20,4 +20,4 @@
 
 LOCAL_MODULE := VtsKernelApiSysfsTest
 VTS_CONFIG_SRC_DIR := testcases/kernel/api/sysfs
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/sysfs/KernelApiSysfsTest.py b/api/sysfs/KernelApiSysfsTest.py
index 78ed074..bcc9382 100644
--- a/api/sysfs/KernelApiSysfsTest.py
+++ b/api/sysfs/KernelApiSysfsTest.py
@@ -22,7 +22,7 @@
 from vts.runners.host import base_test
 from vts.runners.host import test_runner
 from vts.utils.python.controllers import android_device
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class KernelApiSysfsTest(base_test.BaseTestClass):
@@ -73,7 +73,7 @@
         '''
         permission = ''
         try:
-            permission = file_utils.GetPermission(path, self.shell)
+            permission = target_file_utils.GetPermission(path, self.shell)
         except IOError as e:
             logging.exception(e)
             asserts.fail('Path "%s" does not exist or has invalid '
@@ -81,7 +81,7 @@
 
         try:
             asserts.assertTrue(
-                file_utils.IsReadOnly(permission),
+                target_file_utils.IsReadOnly(permission),
                 'path %s is not read only' % path)
         except IOError as e:
             logging.exception(e)
@@ -97,7 +97,7 @@
         '''
         filepath = '/sys/devices/system/cpu/online'
         self.IsReadOnly(filepath)
-        content = file_utils.ReadFileContent(filepath, self.shell)
+        content = target_file_utils.ReadFileContent(filepath, self.shell)
         regex = '(\d+(-\d+)?)(,\d+(-\d+)?)*'
         if content.endswith('\n'):
             content = content[:-1]
@@ -112,7 +112,7 @@
         '''Check the value of /sys/devices/system/cpu/kernel_max.'''
         filepath = '/sys/devices/system/cpu/kernel_max'
         self.IsReadOnly(filepath)
-        content = file_utils.ReadFileContent(filepath, self.shell)
+        content = target_file_utils.ReadFileContent(filepath, self.shell)
         self.ConvertToInteger(content)
 
 
diff --git a/api/tun/Android.mk b/api/tun/Android.mk
index 09fc0b1..b9ecd3a 100644
--- a/api/tun/Android.mk
+++ b/api/tun/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelTunTest
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/Android.mk b/config/Android.mk
index f9c3bbb..181a8e4 100644
--- a/config/Android.mk
+++ b/config/Android.mk
@@ -19,4 +19,4 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelConfig
-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
+-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/config/VtsKernelConfigTest.py b/config/VtsKernelConfigTest.py
index bffb5fa..367f01e 100644
--- a/config/VtsKernelConfigTest.py
+++ b/config/VtsKernelConfigTest.py
@@ -28,7 +28,7 @@
 from vts.runners.host import keys
 from vts.runners.host import test_runner
 from vts.utils.python.controllers import android_device
-from vts.utils.python.file import file_utils
+from vts.utils.python.file import target_file_utils
 
 
 class VtsKernelConfigTest(base_test.BaseTestClass):
@@ -43,9 +43,7 @@
     SUPPORTED_KERNEL_VERSIONS = ["3.18", "4.4", "4.9"]
 
     def setUpClass(self):
-        required_params = [
-            keys.ConfigKeys.IKEY_DATA_FILE_PATH
-        ]
+        required_params = [keys.ConfigKeys.IKEY_DATA_FILE_PATH]
         self.getUserParams(required_params)
         self.dut = self.registerController(android_device)[0]
         self.dut.shell.InvokeTerminal(
@@ -71,8 +69,8 @@
         logging.info("Detected kernel version: %s", kernel_version)
 
         asserts.assertTrue(kernel_version in self.SUPPORTED_KERNEL_VERSIONS,
-                           "Detected kernel version '%s' is not one of %s"
-                           % (kernel_version, self.SUPPORTED_KERNEL_VERSIONS))
+                           "Detected kernel version '%s' is not one of %s" %
+                           (kernel_version, self.SUPPORTED_KERNEL_VERSIONS))
 
         return kernel_version
 
@@ -143,17 +141,17 @@
         requirements.
         """
         logging.info("Testing existence of %s" % self.PROC_FILE_PATH)
-        file_utils.assertPermissionsAndExistence(
-            self.shell, self.PROC_FILE_PATH, file_utils.IsReadOnly)
+        target_file_utils.assertPermissionsAndExistence(
+            self.shell, self.PROC_FILE_PATH, target_file_utils.IsReadOnly)
 
         logging.info("Validating kernel version of device.")
         kernel_version = self.checkKernelVersion()
 
         # Pull configs from the universal config file.
         configs = dict()
-        config_file_path = os.path.join(self.data_file_path,
-            self.KERNEL_CONFIG_FILE_PATH, "android-" + kernel_version,
-            "android-base.cfg")
+        config_file_path = os.path.join(
+            self.data_file_path, self.KERNEL_CONFIG_FILE_PATH,
+            "android-" + kernel_version, "android-base.cfg")
         with open(config_file_path, 'r') as config_file:
             configs = self.parseConfigFileToDict(config_file, configs)
 
@@ -164,15 +162,16 @@
 
         localpath = os.path.join(self._temp_dir, "config.gz")
         with gzip.open(localpath, "rb") as device_config_file:
-            device_configs = self.parseConfigFileToDict(device_config_file,
-                    device_configs)
+            device_configs = self.parseConfigFileToDict(
+                device_config_file, device_configs)
 
         # Check device architecture and pull arch-specific configs.
         kernelArch = self.checkKernelArch(device_configs)
         if kernelArch is not "":
             config_file_path = os.path.join(self.data_file_path,
-                self.KERNEL_CONFIG_FILE_PATH, "android-" + kernel_version,
-                "android-base-%s.cfg" % kernelArch)
+                                            self.KERNEL_CONFIG_FILE_PATH,
+                                            "android-" + kernel_version,
+                                            "android-base-%s.cfg" % kernelArch)
             if os.path.isfile(config_file_path):
                 with open(config_file_path, 'r') as config_file:
                     configs = self.parseConfigFileToDict(config_file, configs)
@@ -196,8 +195,8 @@
                                               device_configs[config_name])
 
         if ("CONFIG_OF" not in device_configs and
-            "CONFIG_ACPI" not in device_configs):
-               should_be_enabled.append("CONFIG_OF | CONFIG_ACPI")
+                "CONFIG_ACPI" not in device_configs):
+            should_be_enabled.append("CONFIG_OF | CONFIG_ACPI")
 
         asserts.assertTrue(
             len(should_be_enabled) == 0 and len(should_not_be_set) == 0 and
diff --git a/config/data/android-3.18/android-base.cfg b/config/data/android-3.18/android-base.cfg
index 9b6eadb..f2c3249 100644
--- a/config/data/android-3.18/android-base.cfg
+++ b/config/data/android-3.18/android-base.cfg
@@ -3,6 +3,8 @@
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_INET_LRO is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFS_FS is not set
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
diff --git a/config/data/android-4.4/android-base.cfg b/config/data/android-4.4/android-base.cfg
index 344443c..48d1428 100644
--- a/config/data/android-4.4/android-base.cfg
+++ b/config/data/android-4.4/android-base.cfg
@@ -2,7 +2,9 @@
 # CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_INET_LRO is not set
+### CONFIG_INET_LRO is not set # TODO (b/63796046) remove redundant "#"
+# CONFIG_NFSD is not set
+# CONFIG_NFS_FS is not set
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
diff --git a/config/data/android-4.9/android-base.cfg b/config/data/android-4.9/android-base.cfg
index 2c7ff9d..8293253 100644
--- a/config/data/android-4.9/android-base.cfg
+++ b/config/data/android-4.9/android-base.cfg
@@ -3,6 +3,8 @@
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_INET_LRO is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFS_FS is not set
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
@@ -17,6 +19,7 @@
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_BPF=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
diff --git a/cpu_profiling/Android.mk b/cpu_profiling/Android.mk
index e5f315e..b05e156 100644
--- a/cpu_profiling/Android.mk
+++ b/cpu_profiling/Android.mk
@@ -15,10 +15,8 @@
 #
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := CpuProfilingTest
 VTS_CONFIG_SRC_DIR := testcases/kernel/cpu_profiling
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/Android.mk b/linux_kselftest/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/linux_kselftest/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/linux_kselftest/presubmit/Android.mk b/linux_kselftest/presubmit/Android.mk
index 5717788..52e91d7 100644
--- a/linux_kselftest/presubmit/Android.mk
+++ b/linux_kselftest/presubmit/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLinuxKselftestPresubmit
 VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/presubmit
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/stable/Android.mk b/linux_kselftest/stable/Android.mk
index 03f25bd..ddc23e0 100644
--- a/linux_kselftest/stable/Android.mk
+++ b/linux_kselftest/stable/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLinuxKselftest
 VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/stable
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/staging/Android.mk b/linux_kselftest/staging/Android.mk
index 9dec40e..c413cf3 100644
--- a/linux_kselftest/staging/Android.mk
+++ b/linux_kselftest/staging/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VtsKernelLinuxKselftestStaging
 VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/staging
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/ltp/Android.mk b/ltp/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/ltp/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/ltp/KernelLtpTest.py b/ltp/KernelLtpTest.py
index ae3c3f0..ccf8880 100644
--- a/ltp/KernelLtpTest.py
+++ b/ltp/KernelLtpTest.py
@@ -26,10 +26,10 @@
 from vts.runners.host import base_test
 from vts.runners.host import const
 from vts.runners.host import keys
+from vts.runners.host import records
 from vts.runners.host import test_runner
 from vts.utils.python.common import cmd_utils
 from vts.utils.python.common import list_utils
-from vts.utils.python.controllers import android_device
 
 from vts.testcases.kernel.ltp import test_cases_parser
 from vts.testcases.kernel.ltp import environment_requirement_checker as env_checker
@@ -56,8 +56,6 @@
                            the number is less than 0, it will be set to 1. If
                            the number is greater than 0, that number of threads
                            will be created to run the tests.
-        include_filter: list of string, a list of test case names to run
-        exclude_filter: list of string, a list of test case names to exclude
     """
     _32BIT = "32"
     _64BIT = "64"
@@ -91,21 +89,16 @@
         logging.info("%s: %s", ltp_enums.ConfigKeys.LTP_NUMBER_OF_THREADS,
                      self.number_of_threads)
 
-        self._dut = self.registerController(android_device)[0]
+        self._dut = self.android_devices[0]
         logging.info("product_type: %s", self._dut.product_type)
-        self._dut.shell.InvokeTerminal("one")
-        self.shell = self._dut.shell.one
+        self.shell = self._dut.shell
 
         self._requirement = env_checker.EnvironmentRequirementChecker(
             self.shell)
         self._shell_env = shell_environment.ShellEnvironment(self.shell)
 
-        disabled_tests = self.ExpandFilterBitness(ltp_configs.DISABLED_TESTS)
-        staging_tests = self.ExpandFilterBitness(ltp_configs.STAGING_TESTS)
-
         self._testcases = test_cases_parser.TestCasesParser(
-            self.data_file_path, self.filterOneTest, disabled_tests,
-            staging_tests)
+            self.data_file_path, self.filterOneTest)
 
         self._env = {
             ltp_enums.ShellEnvKeys.TMP: ltp_configs.TMP,
@@ -254,7 +247,7 @@
             self._testcases.Load(
                 ltp_configs.LTPDIR,
                 n_bit,
-                self.include_filter,
+                self.test_filter,
                 run_staging=self.run_staging,
                 is_low_mem=is_low_mem))
 
@@ -303,7 +296,7 @@
             n_workers = 1
 
         # Include filter is not empty; Run in sequential.
-        if self.include_filter:
+        if self.test_filter.include_filter:
             n_workers = 1
 
         # Number of thread is set to 0 (automatic)
@@ -444,7 +437,8 @@
             **kwargs: any additional keyword arguments for runner
         """
         self._report_thread_lock.acquire()
-        self.results.requested.append(test_name)
+        tr_record = records.TestResultRecord(test_name, self.TAG)
+        self.results.requested.append(tr_record)
         try:
             self.execOneTest(test_name, function, args, **kwargs)
         except Exception as e:
diff --git a/ltp/configs/__init__.py b/ltp/configs/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ltp/configs/__init__.py
diff --git a/ltp/configs/disabled_tests.py b/ltp/configs/disabled_tests.py
new file mode 100644
index 0000000..3bd819f
--- /dev/null
+++ b/ltp/configs/disabled_tests.py
@@ -0,0 +1,428 @@
+# Tests disabled
+# Based on external/ltp commit 5f01077afe994f4107b147222f3956716d4a8fde
+DISABLED_TESTS = [
+    # gunzip newly added on 4/12/17 and test is failing because -r option is not yet implemented.
+    'commands.gzip01',
+    # b/32386191 getrusage04 result is flaky
+    'syscalls.getrusage04',
+    # b/31154962
+    'cpuhotplug.cpuhotplug02',
+    # The following test cases are uncategorized
+    'syscalls.fcntl34',
+    'syscalls.fcntl34_64',
+    'syscalls.inotify06',
+    'syscalls.abort01',
+    'syscalls.chmod05',
+    'syscalls.chmod07',
+    'syscalls.chown01_16',
+    'syscalls.chown02_16',
+    'syscalls.chown03_16',
+    'syscalls.chown05_16',
+    'syscalls.fchmod01',
+    'syscalls.fchmod02',
+    'syscalls.fchmod05',
+    'syscalls.fchmod06',
+    'syscalls.fchown01_16',
+    'syscalls.fchown02_16',
+    'syscalls.fchown03_16',
+    'syscalls.fchown04_16',
+    'syscalls.fchown05_16',
+    'syscalls.fsync01',
+    'syscalls.ftruncate04',
+    'syscalls.ftruncate04_64',
+    'syscalls.getcwd02',
+    'syscalls.getcwd03',
+    'syscalls.getegid01_16',
+    'syscalls.getegid02_16',
+    'syscalls.geteuid01_16',
+    'syscalls.geteuid02_16',
+    'syscalls.getgid01_16',
+    'syscalls.getgid03_16',
+    'syscalls.getgroups01_16',
+    'syscalls.gethostbyname_r01',
+    'syscalls.getuid01_16',
+    'syscalls.getuid03_16',
+    'syscalls.ioctl03',
+    'syscalls.inotify03',
+    'syscalls.kill11',
+    'syscalls.lchown01_16',
+    'syscalls.lchown02_16',
+    'syscalls.lchown03_16',
+    'syscalls.link08',
+    'syscalls.linkat02',
+    'syscalls.mkdir03',
+    'syscalls.rmdir02',
+    'syscalls.mkdirat02',
+    'syscalls.mknod07',
+    'syscalls.mknodat02',
+    'syscalls.mmap16',
+    'syscalls.mount01',
+    'syscalls.mount02',
+    'syscalls.mount03',
+    'syscalls.mount04',
+    'syscalls.mount06',
+    'syscalls.move_pages03',
+    'syscalls.move_pages11',
+    'syscalls.mprotect01',
+    'syscalls.nftw01',
+    'syscalls.nftw6401',
+    'syscalls.nice04',
+    'syscalls.open01',
+    'syscalls.open08',
+    'syscalls.open11',
+    'syscalls.madvise01',
+    'syscalls.madvise02',
+    'syscalls.madvise06',
+    'syscalls.pathconf01',
+    'syscalls.preadv02',
+    'syscalls.process_vm_readv01',
+    'syscalls.process_vm_writev01',
+    'syscalls.pwritev01_64',
+    'syscalls.pwritev02',
+    'syscalls.quotactl01',
+    'syscalls.readlink04',
+    'syscalls.rename11',
+    'syscalls.renameat01',
+    'syscalls.request_key01',
+    'syscalls.request_key02',
+    'syscalls.rt_sigprocmask01',
+    'syscalls.sbrk03',
+    'syscalls.setfsgid01_16',
+    'syscalls.setfsgid02_16',
+    'syscalls.setfsgid03_16',
+    'syscalls.setfsuid01_16',
+    'syscalls.setfsuid02_16',
+    'syscalls.setfsuid03_16',
+    'syscalls.setfsuid04_16',
+    'syscalls.setgid01_16',
+    'syscalls.setgid02_16',
+    'syscalls.setgid03_16',
+    'syscalls.setgroups01_16',
+    'syscalls.setgroups02_16',
+    'syscalls.setgroups03_16',
+    'syscalls.setgroups04_16',
+    'syscalls.setregid01_16',
+    'syscalls.setregid02_16',
+    'syscalls.setregid03_16',
+    'syscalls.setregid04_16',
+    'syscalls.setresgid01_16',
+    'syscalls.setresgid02_16',
+    'syscalls.setresgid03_16',
+    'syscalls.setresgid04_16',
+    'syscalls.setresuid01_16',
+    'syscalls.setresuid02_16',
+    'syscalls.setresuid03_16',
+    'syscalls.setresuid04_16',
+    'syscalls.setresuid05_16',
+    'syscalls.setreuid01_16',
+    'syscalls.setreuid02_16',
+    'syscalls.setreuid03_16',
+    'syscalls.setreuid04_16',
+    'syscalls.setreuid05_16',
+    'syscalls.setreuid06_16',
+    'syscalls.setreuid07_16',
+    'syscalls.setuid01_16',
+    'syscalls.setuid02_16',
+    'syscalls.setuid03_16',
+    'syscalls.setuid04_16',
+    'syscalls.splice02',
+    'syscalls.sysconf01',
+    'syscalls.syslog01',
+    'syscalls.syslog02',
+    'syscalls.syslog03',
+    'syscalls.syslog04',
+    'syscalls.syslog05',
+    'syscalls.syslog06',
+    'syscalls.syslog07',
+    'syscalls.syslog08',
+    'syscalls.syslog09',
+    'syscalls.syslog10',
+    'syscalls.umask02',
+    'syscalls.umask03',
+    'syscalls.umount01',
+    'syscalls.umount02',
+    'syscalls.umount03',
+    'syscalls.umount2_01',
+    'syscalls.umount2_02',
+    'syscalls.umount2_03',
+    'syscalls.utime06',
+    'syscalls.utimes01',
+    'syscalls.utimensat01',
+    'syscalls.waitpid05',
+    'fs.gf01',
+    'fs.gf02',
+    'fs.gf03',
+    'fs.gf04',
+    'fs.gf05',
+    'fs.gf06',
+    'fs.gf07',
+    'fs.gf08',
+    'fs.gf09',
+    'fs.gf10',
+    'fs.gf11',
+    'fs.gf14',
+    'fs.gf15',
+    'fs.gf16',
+    'fs.gf17',
+    'fs.gf18',
+    'fs.gf19',
+    'fs.gf20',
+    'fs.gf21',
+    'fs.gf22',
+    'fs.gf23',
+    'fs.gf24',
+    'fs.gf25',
+    'fs.gf26',
+    'fs.gf27',
+    'fs.gf28',
+    'fs.gf29',
+    'fs.gf30',
+    'fs.rwtest01',
+    'fs.rwtest02',
+    'fs.rwtest03',
+    'fs.rwtest04',
+    'fs.rwtest05',
+    'fs.iogen01',
+    'fs.fs_inod01',
+    'fs.ftest06',
+    'fs.isofs',
+    'fsx.fsx-linux',
+    'io.aio01',
+    'io.aio02',
+    'mm.mtest06',
+    'mm.shm_test01',
+    'mm.mallocstress01',
+    'mm.mmapstress04',
+    'mm.mmapstress07',
+    'mm.vma03',
+    'mm.min_free_kbytes',
+    'pipes.pipeio_1',
+    'pipes.pipeio_3',
+    'pipes.pipeio_4',
+    'pipes.pipeio_5',
+    'pipes.pipeio_6',
+    'pipes.pipeio_8',
+    'sched.trace_sched01',
+    'math.float_bessel',
+    'math.float_exp_log',
+    'math.float_iperb',
+    'math.float_power',
+    'math.float_trigo',
+    'pty.pty01',
+    'containers.mqns_01_clone',
+    'containers.mqns_02_clone',
+    'containers.mqns_03_clone',
+    'containers.mqns_04_clone',
+    'containers.netns_netlink',
+    'containers.netns_breakns_ns_exec_ipv4_netlink',
+    'containers.netns_breakns_ns_exec_ipv6_netlink',
+    'containers.netns_breakns_ns_exec_ipv4_ioctl',
+    'containers.netns_breakns_ns_exec_ipv6_ioctl',
+    'containers.netns_breakns_ip_ipv4_netlink',
+    'containers.netns_breakns_ip_ipv6_netlink',
+    'containers.netns_breakns_ip_ipv4_ioctl',
+    'containers.netns_breakns_ip_ipv6_ioctl',
+    'containers.netns_comm_ns_exec_ipv4_netlink',
+    'containers.netns_comm_ns_exec_ipv6_netlink',
+    'containers.netns_comm_ns_exec_ipv4_ioctl',
+    'containers.netns_comm_ns_exec_ipv6_ioctl',
+    'containers.netns_comm_ip_ipv4_netlink',
+    'containers.netns_comm_ip_ipv6_netlink',
+    'containers.netns_comm_ip_ipv4_ioctl',
+    'containers.netns_comm_ip_ipv6_ioctl',
+    'containers.netns_sysfs',
+    'containers.shmnstest_none',
+    'containers.shmnstest_clone',
+    'containers.shmnstest_unshare',
+    'containers.shmem_2nstest_none',
+    'containers.shmem_2nstest_clone',
+    'containers.shmem_2nstest_unshare',
+    'containers.mesgq_nstest_none',
+    'containers.mesgq_nstest_clone',
+    'containers.mesgq_nstest_unshare',
+    'containers.sem_nstest_none',
+    'containers.sem_nstest_clone',
+    'containers.sem_nstest_unshare',
+    'containers.semtest_2ns_none',
+    'containers.semtest_2ns_clone',
+    'containers.semtest_2ns_unshare',
+    'fs_bind.BindMounts',
+    'filecaps.Filecaps',
+    'cap_bounds.Cap_bounds',
+    'fcntl-locktests_android.FCNTL_LOCKTESTS',
+    'admin_tools.su01',
+    'admin_tools.cron02',
+    'admin_tools.cron_deny01',
+    'admin_tools.cron_allow01',
+    'admin_tools.cron_dirs_checks01',
+    'numa.move_pages03',
+    'numa.move_pages11',
+    'hugetlb.hugemmap05_1',
+    'hugetlb.hugemmap05_2',
+    'hugetlb.hugemmap05_3',
+    'commands.ar',
+    'commands.ld',
+    'commands.nm',
+    'commands.objdump',
+    'commands.file',
+    'commands.tar',
+    'commands.cron',
+    'commands.logrotate',
+    'commands.mail',
+    'commands.cpio',
+    'commands.unzip01',
+    'commands.cp_tests01',
+    'commands.ln_tests01',
+    'commands.mkdir_tests01',
+    'commands.mv_tests01',
+    'commands.size01',
+    'commands.sssd01',
+    'commands.sssd02',
+    'commands.sssd03',
+    'commands.du01',
+    'commands.mkfs01',
+    'commands.lsmod01',
+    'commands.wc01',
+    # following 4 tests added int LTP20170516 are disabled here
+    # because they fail at the time of merge
+    'commands.file01',
+    'commands.ldd01',
+    'commands.mv01',
+    'commands.tar01',
+    'hyperthreading.smt_smp_enabled',
+    'hyperthreading.smt_smp_affinity',
+    'kernel_misc.zram03',
+    'fs_ext4.ext4-uninit-groups',
+    'fs_ext4.ext4-persist-prealloc',
+    'cpuhotplug.cpuhotplug03',
+    'cpuhotplug.cpuhotplug06',
+    'input.input06',
+    'dio.dio10',
+    # dio29 and dio30 take too long to finish
+    'dio.dio29',
+    'dio.dio30',
+    'fsx.fsx-linux',
+    'dio.dio04',
+    'numa.Numa-testcases',
+    'syscalls.connect01',
+    'syscalls.prot_hsymlinks',
+    'fs.ftest01',
+    'fs.ftest03',
+    'fs.ftest04',
+    'fs.ftest05',
+    'fs.ftest07',
+    'fs.ftest08',
+    'fs.inode02',
+    'ipc.signal_test_01',
+    'mm.data_space',
+    'mm.mmapstress01',
+    'mm.mmapstress03',
+    'mm.mmapstress09',
+    'mm.mmapstress10',
+    'syscalls.clock_nanosleep01',
+    'syscalls.clone04',
+    'syscalls.fcntl14',
+    'syscalls.fcntl14',
+    'syscalls.fcntl14_64',
+    'syscalls.fcntl17',
+    'syscalls.fcntl17_64',
+    'syscalls.getdomainname01',
+    'syscalls.kill12',
+    'syscalls.setdomainname01',
+    'syscalls.setdomainname02',
+    'syscalls.setdomainname03',
+    'syscalls.sighold02',
+    'syscalls.sigpending02',
+    'syscalls.sigrelse01',
+    'syscalls.vfork02',
+    # The following tests are not stable on 64bit version
+    'input.input01_64bit',
+    'input.input02_64bit',
+    'input.input03_64bit',
+    'input.input04_64bit',
+    'input.input05_64bit',
+    'input.input06_64bit',
+    # The following tests are failing on 64bit version
+    'mm.overcommit_memory01_64bit',
+    'mm.overcommit_memory02_64bit',
+    'mm.overcommit_memory03_64bit',
+    'mm.overcommit_memory04_64bit',
+    'mm.overcommit_memory05_64bit',
+    'mm.overcommit_memory06_64bit',
+    # 'which' in Android does not accept the tested options b/31152668
+    'commands.which01',
+    # tests that are currently killing some lab devices 64bit on (pixel and bullhead)
+    # b/31181781
+    'mm.oom01_64bit',
+    'mm.oom02_64bit',
+    'mm.oom03_64bit',
+    'mm.oom04_64bit',
+    'mm.oom05_64bit',
+    'mm.swapping01_64bit',
+    'mm.thp01_64bit',
+    'mm.thp02_64bit',
+    'mm.thp03_64bit',
+    'mm.vma01_64bit',
+    # b/65636203
+    'mm.thp01_32bit',
+    # kmsg01 would pass but it occasionally causes socket timeout and misalignment
+    # of request and response
+    # b/32343072
+    'kernel_misc.kmsg01',
+    # alarm02 tests for a boundary condition which is impractical to implement
+    # correctly on 32-bit Linux.  bionic deliberately breaks with POSIX by reporting
+    # that it failed to set up the alarm.  (Other libc implementations fail to
+    # set up the alarm too, but then return 0 anyway.)
+    'syscalls.alarm02',
+    # readdir02 calls opendir() -> closedir() -> readdir() and checks if readdir()
+    # returns EBADF.  POSIX doesn't require this, and bionic is likely to instead
+    # deadlock trying to acquire a destroyed mutex.
+    'syscalls.readdir02',
+    # Android sets RLIMIT_NICE to 40, so setpriority02 succeeds unexpectedly
+    'syscalls.setpriority02',
+    # fork13 takes ~45 minutes to run
+    'syscalls.fork13',
+    # open13 tests that fchmod() fails on fds opened with O_PATH.  bionic
+    # deliberately masks the EBADF returned by the kernel.
+    #
+    # https://android-review.googlesource.com/#/c/127908/
+    'syscalls.open13',
+    # Bug#30675453
+    'syscalls.perf_event_open02',
+    # Bug#30688551
+    'syscalls.lstat03_64',
+    'syscalls.lstat03',
+    # Bug#30688061
+    'input.input03',
+    # Bug#30688056
+    'cpuhotplug.cpuhotplug04',
+    # Bug#30699880
+    'mm.mtest01w',
+    'mm.mtest01',
+    # Bug#30688574
+    'syscalls.accept4_01',
+    # Bug#30689411
+    'mm.mmapstress03',
+    # Bug #32100169
+    'dma_thread_diotest.dma_thread_diotest1',
+    'dma_thread_diotest.dma_thread_diotest2',
+    'dma_thread_diotest.dma_thread_diotest3',
+    'dma_thread_diotest.dma_thread_diotest4',
+    'dma_thread_diotest.dma_thread_diotest5',
+    'dma_thread_diotest.dma_thread_diotest6',
+    'dma_thread_diotest.dma_thread_diotest7',
+    # b/33008689 (closed) requires mkfs.ext4 and loop device support.
+    'fs.quota_remount_test01',
+    # Following tests added in LTP20170516 release are disabled because
+    # they currently fail with VTS
+    'syscalls.access02',
+    'syscalls.access04',
+    'syscalls.getcwd01',
+    'syscalls.getxattr04',
+    'syscalls.ioctl04',
+    'syscalls.ioctl05',
+    'syscalls.ioctl06',
+    'syscalls.kcmp03',
+    'syscalls.madvise08',
+    'syscalls.pselect01',
+]
diff --git a/ltp/configs/stable_tests.py b/ltp/configs/stable_tests.py
new file mode 100644
index 0000000..fc918f4
--- /dev/null
+++ b/ltp/configs/stable_tests.py
@@ -0,0 +1,1651 @@
+STABLE_TESTS = [
+    'commands.ldd_32bit',
+    'commands.ldd_64bit',
+    'containers.mountns01_32bit',
+    'containers.mountns01_64bit',
+    'containers.mountns02_32bit',
+    'containers.mountns02_64bit',
+    'containers.mountns03_32bit',
+    'containers.mountns03_64bit',
+    'containers.mountns04_32bit',
+    'containers.mountns04_64bit',
+    'dio.dio01_32bit',
+    'dio.dio01_64bit',
+    'dio.dio02_32bit',
+    'dio.dio02_64bit',
+    'dio.dio03_32bit',
+    'dio.dio03_64bit',
+    'dio.dio05_32bit',
+    'dio.dio05_64bit',
+    'dio.dio06_32bit',
+    'dio.dio06_64bit',
+    'dio.dio07_32bit',
+    'dio.dio07_64bit',
+    'dio.dio08_32bit',
+    'dio.dio08_64bit',
+    'dio.dio09_32bit',
+    'dio.dio09_64bit',
+    'dio.dio11_32bit',
+    'dio.dio11_64bit',
+    'dio.dio12_32bit',
+    'dio.dio12_64bit',
+    'dio.dio13_32bit',
+    'dio.dio13_64bit',
+    'dio.dio14_32bit',
+    'dio.dio14_64bit',
+    'dio.dio15_32bit',
+    'dio.dio15_64bit',
+    'dio.dio16_32bit',
+    'dio.dio16_64bit',
+    'dio.dio17_32bit',
+    'dio.dio17_64bit',
+    'dio.dio18_32bit',
+    'dio.dio18_64bit',
+    'dio.dio19_32bit',
+    'dio.dio19_64bit',
+    'dio.dio20_32bit',
+    'dio.dio20_64bit',
+    'dio.dio21_32bit',
+    'dio.dio21_64bit',
+    'dio.dio22_32bit',
+    'dio.dio22_64bit',
+    'dio.dio23_32bit',
+    'dio.dio23_64bit',
+    'dio.dio24_32bit',
+    'dio.dio24_64bit',
+    'dio.dio25_32bit',
+    'dio.dio25_64bit',
+    'dio.dio26_32bit',
+    'dio.dio26_64bit',
+    'dio.dio27_32bit',
+    'dio.dio27_64bit',
+    'dio.dio28_32bit',
+    'dio.dio28_64bit',
+    'fs.fs_di_32bit',
+    'fs.fs_di_64bit',
+    'fs.fs_racer_32bit',
+    'fs.fs_racer_64bit',
+    'fs.ftest02_32bit',
+    'fs.ftest02_64bit',
+    'fs.inode01_32bit',
+    'fs.inode01_64bit',
+    'fs.lftest01_32bit',
+    'fs.lftest01_64bit',
+    'fs.linker01_32bit',
+    'fs.linker01_64bit',
+    'fs.openfile01_32bit',
+    'fs.openfile01_64bit',
+    'fs.stream01_32bit',
+    'fs.stream01_64bit',
+    'fs.stream02_32bit',
+    'fs.stream02_64bit',
+    'fs.stream03_32bit',
+    'fs.stream03_64bit',
+    'fs.stream04_32bit',
+    'fs.stream04_64bit',
+    'fs.stream05_32bit',
+    'fs.stream05_64bit',
+    'fs.writetest01_32bit',
+    'fs.writetest01_64bit',
+    'fs_perms_simple.fs_perms01_32bit',
+    'fs_perms_simple.fs_perms01_64bit',
+    'fs_perms_simple.fs_perms02_32bit',
+    'fs_perms_simple.fs_perms02_64bit',
+    'fs_perms_simple.fs_perms03_32bit',
+    'fs_perms_simple.fs_perms03_64bit',
+    'fs_perms_simple.fs_perms04_32bit',
+    'fs_perms_simple.fs_perms04_64bit',
+    'fs_perms_simple.fs_perms05_32bit',
+    'fs_perms_simple.fs_perms05_64bit',
+    'fs_perms_simple.fs_perms06_32bit',
+    'fs_perms_simple.fs_perms06_64bit',
+    'fs_perms_simple.fs_perms07_32bit',
+    'fs_perms_simple.fs_perms07_64bit',
+    'fs_perms_simple.fs_perms08_32bit',
+    'fs_perms_simple.fs_perms08_64bit',
+    'fs_perms_simple.fs_perms09_32bit',
+    'fs_perms_simple.fs_perms09_64bit',
+    'fs_perms_simple.fs_perms10_32bit',
+    'fs_perms_simple.fs_perms10_64bit',
+    'fs_perms_simple.fs_perms11_32bit',
+    'fs_perms_simple.fs_perms11_64bit',
+    'fs_perms_simple.fs_perms12_32bit',
+    'fs_perms_simple.fs_perms12_64bit',
+    'fs_perms_simple.fs_perms13_32bit',
+    'fs_perms_simple.fs_perms13_64bit',
+    'fs_perms_simple.fs_perms14_32bit',
+    'fs_perms_simple.fs_perms14_64bit',
+    'fs_perms_simple.fs_perms15_32bit',
+    'fs_perms_simple.fs_perms15_64bit',
+    'fs_perms_simple.fs_perms16_32bit',
+    'fs_perms_simple.fs_perms16_64bit',
+    'fs_perms_simple.fs_perms17_32bit',
+    'fs_perms_simple.fs_perms17_64bit',
+    'fs_perms_simple.fs_perms18_32bit',
+    'fs_perms_simple.fs_perms18_64bit',
+    'input.input01_32bit',
+    'input.input02_32bit',
+    'input.input04_32bit',
+    'input.input05_32bit',
+    'ipc.pipe_test_01_32bit',
+    'ipc.pipe_test_01_64bit',
+    'ipc.pipe_test_02_32bit',
+    'ipc.pipe_test_02_64bit',
+    'ipc.pipeio_1_32bit',
+    'ipc.pipeio_1_64bit',
+    'ipc.pipeio_3_32bit',
+    'ipc.pipeio_3_64bit',
+    'ipc.pipeio_4_32bit',
+    'ipc.pipeio_4_64bit',
+    'ipc.pipeio_5_32bit',
+    'ipc.pipeio_5_64bit',
+    'ipc.pipeio_6_32bit',
+    'ipc.pipeio_6_64bit',
+    'ipc.pipeio_8_32bit',
+    'ipc.pipeio_8_64bit',
+    'ipc.signal_test_02_32bit',
+    'ipc.signal_test_02_64bit',
+    'ipc.signal_test_03_32bit',
+    'ipc.signal_test_03_64bit',
+    'ipc.signal_test_04_32bit',
+    'ipc.signal_test_04_64bit',
+    'ipc.signal_test_05_32bit',
+    'ipc.signal_test_05_64bit',
+    'ipc.signal_test_06_32bit',
+    'ipc.signal_test_06_64bit',
+    'ipc.signal_test_07_32bit',
+    'ipc.signal_test_07_64bit',
+    'math.fptest01_32bit',
+    'math.fptest01_64bit',
+    'math.fptest02_32bit',
+    'math.fptest02_64bit',
+    'mm.max_map_count_32bit',
+    'mm.max_map_count_64bit',
+    'mm.mem01_32bit',
+    'mm.mem01_64bit',
+    'mm.mem02_32bit',
+    'mm.mem02_64bit',
+    'mm.mem03_32bit',
+    'mm.mem03_64bit',
+    'mm.mm01_32bit',
+    'mm.mm01_64bit',
+    'mm.mm02_32bit',
+    'mm.mm02_64bit',
+    'mm.mmap10_1_32bit',
+    'mm.mmap10_1_64bit',
+    'mm.mmap10_32bit',
+    'mm.mmap10_64bit',
+    'mm.mmapstress02_32bit',
+    'mm.mmapstress02_64bit',
+    'mm.mmapstress05_32bit',
+    'mm.mmapstress05_64bit',
+    'mm.mmapstress06_32bit',
+    'mm.mmapstress06_64bit',
+    'mm.mtest05_32bit',
+    'mm.mtest05_64bit',
+    'mm.mtest06_2_32bit',
+    'mm.mtest06_2_64bit',
+    'mm.mtest06_3_32bit',
+    'mm.mtest06_3_64bit',
+    'mm.page01_32bit',
+    'mm.page01_64bit',
+    'mm.page02_32bit',
+    'mm.page02_64bit',
+    'mm.stack_space_32bit',
+    'mm.stack_space_64bit',
+    'mm.vma01_32bit',
+    'nptl.nptl01_32bit',
+    'nptl.nptl01_64bit',
+    'pty.hangup01_32bit',
+    'pty.hangup01_64bit',
+    'pty.ptem01_32bit',
+    'pty.ptem01_64bit',
+    'sched.hackbench01_32bit',
+    'sched.hackbench01_64bit',
+    'sched.hackbench02_32bit',
+    'sched.hackbench02_64bit',
+    'sched.pth_str01_32bit',
+    'sched.pth_str01_64bit',
+    'sched.pth_str02_32bit',
+    'sched.pth_str02_64bit',
+    'sched.pth_str03_32bit',
+    'sched.pth_str03_64bit',
+    'sched.sched_cli_serv_32bit',
+    'sched.sched_cli_serv_64bit',
+    'sched.sched_getattr01_32bit',
+    'sched.sched_getattr01_64bit',
+    'sched.sched_getattr02_32bit',
+    'sched.sched_getattr02_64bit',
+    'sched.sched_setattr01_32bit',
+    'sched.sched_setattr01_64bit',
+    'sched.sched_stress_32bit',
+    'sched.sched_stress_64bit',
+    'sched.time-schedule01_32bit',
+    'sched.time-schedule01_64bit',
+    'securebits.check_keepcaps01_32bit',
+    'securebits.check_keepcaps02_32bit',
+    'securebits.check_keepcaps03_32bit',
+    'syscalls.accept01_32bit',
+    'syscalls.accept01_64bit',
+    'syscalls.access01_32bit',
+    'syscalls.access01_64bit',
+    'syscalls.access03_32bit',
+    'syscalls.access03_64bit',
+    'syscalls.access05_32bit',
+    'syscalls.access05_64bit',
+    'syscalls.add_key01_32bit',
+    'syscalls.add_key01_64bit',
+    'syscalls.add_key02_32bit',
+    'syscalls.add_key02_64bit',
+    'syscalls.adjtimex01_32bit',
+    'syscalls.adjtimex01_64bit',
+    'syscalls.adjtimex02_32bit',
+    'syscalls.adjtimex02_64bit',
+    'syscalls.alarm01_32bit',
+    'syscalls.alarm01_64bit',
+    'syscalls.alarm03_32bit',
+    'syscalls.alarm03_64bit',
+    'syscalls.alarm05_32bit',
+    'syscalls.alarm05_64bit',
+    'syscalls.alarm06_32bit',
+    'syscalls.alarm06_64bit',
+    'syscalls.alarm07_32bit',
+    'syscalls.alarm07_64bit',
+    'syscalls.asyncio02_32bit',
+    'syscalls.asyncio02_64bit',
+    'syscalls.bdflush01_32bit',
+    'syscalls.bdflush01_64bit',
+    'syscalls.bind01_32bit',
+    'syscalls.bind01_64bit',
+    'syscalls.bind02_32bit',
+    'syscalls.bind02_64bit',
+    'syscalls.brk01_32bit',
+    'syscalls.brk01_64bit',
+    'syscalls.capget01_32bit',
+    'syscalls.capget01_64bit',
+    'syscalls.capget02_32bit',
+    'syscalls.capget02_64bit',
+    'syscalls.capset01_32bit',
+    'syscalls.capset01_64bit',
+    'syscalls.capset02_32bit',
+    'syscalls.capset02_64bit',
+    'syscalls.chdir01A_32bit',
+    'syscalls.chdir01A_64bit',
+    'syscalls.chdir01_32bit',
+    'syscalls.chdir01_64bit',
+    'syscalls.chdir02_32bit',
+    'syscalls.chdir02_64bit',
+    'syscalls.chdir03_32bit',
+    'syscalls.chdir03_64bit',
+    'syscalls.chdir04_32bit',
+    'syscalls.chdir04_64bit',
+    'syscalls.chmod01A_32bit',
+    'syscalls.chmod01A_64bit',
+    'syscalls.chmod01_32bit',
+    'syscalls.chmod01_64bit',
+    'syscalls.chmod02_32bit',
+    'syscalls.chmod02_64bit',
+    'syscalls.chmod03_32bit',
+    'syscalls.chmod03_64bit',
+    'syscalls.chmod04_32bit',
+    'syscalls.chmod04_64bit',
+    'syscalls.chroot01_32bit',
+    'syscalls.chroot01_64bit',
+    'syscalls.chroot02_32bit',
+    'syscalls.chroot02_64bit',
+    'syscalls.chroot03_32bit',
+    'syscalls.chroot03_64bit',
+    'syscalls.chroot04_32bit',
+    'syscalls.chroot04_64bit',
+    'syscalls.clock_getres01_32bit',
+    'syscalls.clock_getres01_64bit',
+    'syscalls.clock_nanosleep2_01_32bit',
+    'syscalls.clock_nanosleep2_01_64bit',
+    'syscalls.clone01_32bit',
+    'syscalls.clone01_64bit',
+    'syscalls.clone02_32bit',
+    'syscalls.clone02_64bit',
+    'syscalls.clone03_32bit',
+    'syscalls.clone03_64bit',
+    'syscalls.clone05_32bit',
+    'syscalls.clone05_64bit',
+    'syscalls.clone06_32bit',
+    'syscalls.clone06_64bit',
+    'syscalls.clone07_32bit',
+    'syscalls.clone07_64bit',
+    'syscalls.clone08_32bit',
+    'syscalls.clone08_64bit',
+    'syscalls.close01_32bit',
+    'syscalls.close01_64bit',
+    'syscalls.close02_32bit',
+    'syscalls.close02_64bit',
+    'syscalls.close08_32bit',
+    'syscalls.close08_64bit',
+    'syscalls.creat01_32bit',
+    'syscalls.creat01_64bit',
+    'syscalls.creat03_32bit',
+    'syscalls.creat03_64bit',
+    'syscalls.creat04_32bit',
+    'syscalls.creat04_64bit',
+    'syscalls.creat05_32bit',
+    'syscalls.creat05_64bit',
+    'syscalls.creat07_32bit',
+    'syscalls.creat07_64bit',
+    'syscalls.dup01_32bit',
+    'syscalls.dup01_64bit',
+    'syscalls.dup02_32bit',
+    'syscalls.dup02_64bit',
+    'syscalls.dup03_32bit',
+    'syscalls.dup03_64bit',
+    'syscalls.dup04_32bit',
+    'syscalls.dup04_64bit',
+    'syscalls.dup05_32bit',
+    'syscalls.dup05_64bit',
+    'syscalls.dup06_32bit',
+    'syscalls.dup06_64bit',
+    'syscalls.dup07_32bit',
+    'syscalls.dup07_64bit',
+    'syscalls.dup201_32bit',
+    'syscalls.dup201_64bit',
+    'syscalls.dup202_32bit',
+    'syscalls.dup202_64bit',
+    'syscalls.dup203_32bit',
+    'syscalls.dup203_64bit',
+    'syscalls.dup204_32bit',
+    'syscalls.dup204_64bit',
+    'syscalls.dup205_32bit',
+    'syscalls.dup205_64bit',
+    'syscalls.dup3_01_32bit',
+    'syscalls.dup3_01_64bit',
+    'syscalls.dup3_02_32bit',
+    'syscalls.dup3_02_64bit',
+    'syscalls.epoll01_32bit',
+    'syscalls.epoll01_64bit',
+    'syscalls.epoll_create1_01_32bit',
+    'syscalls.epoll_create1_01_64bit',
+# epoll_ctl01 flakey due to b/62575538
+#    'syscalls.epoll_ctl01_32bit',
+#    'syscalls.epoll_ctl01_64bit',
+    'syscalls.epoll_ctl02_32bit',
+    'syscalls.epoll_ctl02_64bit',
+# epoll_wait01 flakey due to b/62575538
+#    'syscalls.epoll_wait01_32bit',
+#    'syscalls.epoll_wait01_64bit',
+    'syscalls.epoll_wait02_32bit',
+    'syscalls.epoll_wait02_64bit',
+    'syscalls.epoll_wait03_32bit',
+    'syscalls.epoll_wait03_64bit',
+    'syscalls.eventfd2_01_32bit',
+    'syscalls.eventfd2_01_64bit',
+    'syscalls.eventfd2_02_32bit',
+    'syscalls.eventfd2_02_64bit',
+    'syscalls.eventfd2_03_32bit',
+    'syscalls.eventfd2_03_64bit',
+    'syscalls.execl01_32bit',
+    'syscalls.execl01_64bit',
+    'syscalls.execle01_32bit',
+    'syscalls.execle01_64bit',
+    'syscalls.execlp01_32bit',
+    'syscalls.execlp01_64bit',
+    'syscalls.execv01_32bit',
+    'syscalls.execv01_64bit',
+    'syscalls.execve01_32bit',
+    'syscalls.execve01_64bit',
+    'syscalls.execve02_32bit',
+    'syscalls.execve02_64bit',
+    'syscalls.execve03_32bit',
+    'syscalls.execve03_64bit',
+    'syscalls.execve04_32bit',
+    'syscalls.execve04_64bit',
+    'syscalls.execve05_32bit',
+    'syscalls.execve05_64bit',
+    'syscalls.execvp01_32bit',
+    'syscalls.execvp01_64bit',
+    'syscalls.exit01_32bit',
+    'syscalls.exit01_64bit',
+    'syscalls.exit02_32bit',
+    'syscalls.exit02_64bit',
+    'syscalls.exit_group01_32bit',
+    'syscalls.exit_group01_64bit',
+    'syscalls.faccessat01_32bit',
+    'syscalls.faccessat01_64bit',
+    'syscalls.fallocate01_32bit',
+    'syscalls.fallocate01_64bit',
+    'syscalls.fallocate02_32bit',
+    'syscalls.fallocate02_64bit',
+    'syscalls.fallocate03_32bit',
+    'syscalls.fallocate03_64bit',
+    'syscalls.fallocate04_32bit',
+    'syscalls.fallocate04_64bit',
+    'syscalls.fchdir01_32bit',
+    'syscalls.fchdir01_64bit',
+    'syscalls.fchdir02_32bit',
+    'syscalls.fchdir02_64bit',
+    'syscalls.fchdir03_32bit',
+    'syscalls.fchdir03_64bit',
+    'syscalls.fchmod03_32bit',
+    'syscalls.fchmod03_64bit',
+    'syscalls.fchmod04_32bit',
+    'syscalls.fchmod04_64bit',
+    'syscalls.fchmod07_32bit',
+    'syscalls.fchmod07_64bit',
+    'syscalls.fchmodat01_32bit',
+    'syscalls.fchmodat01_64bit',
+    'syscalls.fchownat01_32bit',
+    'syscalls.fchownat01_64bit',
+    'syscalls.fchownat02_32bit',
+    'syscalls.fchownat02_64bit',
+    'syscalls.fcntl01_32bit',
+    'syscalls.fcntl01_64_32bit',
+    'syscalls.fcntl01_64_64bit',
+    'syscalls.fcntl01_64bit',
+    'syscalls.fcntl02_32bit',
+    'syscalls.fcntl02_64_32bit',
+    'syscalls.fcntl02_64_64bit',
+    'syscalls.fcntl02_64bit',
+    'syscalls.fcntl03_32bit',
+    'syscalls.fcntl03_64_32bit',
+    'syscalls.fcntl03_64_64bit',
+    'syscalls.fcntl03_64bit',
+    'syscalls.fcntl04_32bit',
+    'syscalls.fcntl04_64_32bit',
+    'syscalls.fcntl04_64_64bit',
+    'syscalls.fcntl04_64bit',
+    'syscalls.fcntl05_32bit',
+    'syscalls.fcntl05_64_32bit',
+    'syscalls.fcntl05_64_64bit',
+    'syscalls.fcntl05_64bit',
+    'syscalls.fcntl07_32bit',
+    'syscalls.fcntl07_64_32bit',
+    'syscalls.fcntl07_64_64bit',
+    'syscalls.fcntl07_64bit',
+    'syscalls.fcntl08_32bit',
+    'syscalls.fcntl08_64_32bit',
+    'syscalls.fcntl08_64_64bit',
+    'syscalls.fcntl08_64bit',
+    'syscalls.fcntl09_32bit',
+    'syscalls.fcntl09_64_32bit',
+    'syscalls.fcntl09_64_64bit',
+    'syscalls.fcntl09_64bit',
+    'syscalls.fcntl10_32bit',
+    'syscalls.fcntl10_64_32bit',
+    'syscalls.fcntl10_64_64bit',
+    'syscalls.fcntl10_64bit',
+    'syscalls.fcntl11_32bit',
+    'syscalls.fcntl11_64_32bit',
+    'syscalls.fcntl11_64_64bit',
+    'syscalls.fcntl11_64bit',
+    'syscalls.fcntl12_32bit',
+    'syscalls.fcntl12_64_32bit',
+    'syscalls.fcntl12_64_64bit',
+    'syscalls.fcntl12_64bit',
+    'syscalls.fcntl13_32bit',
+    'syscalls.fcntl13_64_32bit',
+    'syscalls.fcntl13_64_64bit',
+    'syscalls.fcntl13_64bit',
+    'syscalls.fcntl15_32bit',
+    'syscalls.fcntl15_64_32bit',
+    'syscalls.fcntl15_64_64bit',
+    'syscalls.fcntl15_64bit',
+    'syscalls.fcntl16_32bit',
+    'syscalls.fcntl16_64_32bit',
+    'syscalls.fcntl16_64_64bit',
+    'syscalls.fcntl16_64bit',
+    'syscalls.fcntl18_32bit',
+    'syscalls.fcntl18_64_32bit',
+    'syscalls.fcntl18_64_64bit',
+    'syscalls.fcntl18_64bit',
+    'syscalls.fcntl19_32bit',
+    'syscalls.fcntl19_64_32bit',
+    'syscalls.fcntl19_64_64bit',
+    'syscalls.fcntl19_64bit',
+    'syscalls.fcntl20_32bit',
+    'syscalls.fcntl20_64_32bit',
+    'syscalls.fcntl20_64_64bit',
+    'syscalls.fcntl20_64bit',
+    'syscalls.fcntl21_32bit',
+    'syscalls.fcntl21_64_32bit',
+    'syscalls.fcntl21_64_64bit',
+    'syscalls.fcntl21_64bit',
+    'syscalls.fcntl22_32bit',
+    'syscalls.fcntl22_64_32bit',
+    'syscalls.fcntl22_64_64bit',
+    'syscalls.fcntl22_64bit',
+    'syscalls.fcntl23_32bit',
+    'syscalls.fcntl23_64_32bit',
+    'syscalls.fcntl23_64_64bit',
+    'syscalls.fcntl23_64bit',
+    'syscalls.fcntl24_32bit',
+    'syscalls.fcntl24_64_32bit',
+    'syscalls.fcntl24_64_64bit',
+    'syscalls.fcntl24_64bit',
+    'syscalls.fcntl25_32bit',
+    'syscalls.fcntl25_64_32bit',
+    'syscalls.fcntl25_64_64bit',
+    'syscalls.fcntl25_64bit',
+    'syscalls.fcntl26_32bit',
+    'syscalls.fcntl26_64_32bit',
+    'syscalls.fcntl26_64_64bit',
+    'syscalls.fcntl26_64bit',
+    'syscalls.fcntl27_32bit',
+    'syscalls.fcntl27_64_32bit',
+    'syscalls.fcntl27_64_64bit',
+    'syscalls.fcntl27_64bit',
+    'syscalls.fcntl28_32bit',
+    'syscalls.fcntl28_64_32bit',
+    'syscalls.fcntl28_64_64bit',
+    'syscalls.fcntl28_64bit',
+    'syscalls.fcntl29_32bit',
+    'syscalls.fcntl29_64_32bit',
+    'syscalls.fcntl29_64_64bit',
+    'syscalls.fcntl29_64bit',
+    'syscalls.fcntl30_32bit',
+    'syscalls.fcntl30_64_32bit',
+    'syscalls.fcntl30_64_64bit',
+    'syscalls.fcntl30_64bit',
+    'syscalls.fcntl31_32bit',
+    'syscalls.fcntl31_64_32bit',
+    'syscalls.fcntl31_64_64bit',
+    'syscalls.fcntl31_64bit',
+    'syscalls.fcntl32_32bit',
+    'syscalls.fcntl32_64_32bit',
+    'syscalls.fcntl32_64_64bit',
+    'syscalls.fcntl32_64bit',
+    'syscalls.fcntl33_32bit',
+    'syscalls.fcntl33_64_32bit',
+    'syscalls.fcntl33_64_64bit',
+    'syscalls.fcntl33_64bit',
+    'syscalls.fdatasync01_32bit',
+    'syscalls.fdatasync01_64bit',
+    'syscalls.fdatasync02_32bit',
+    'syscalls.fdatasync02_64bit',
+    'syscalls.flock01_32bit',
+    'syscalls.flock01_64bit',
+    'syscalls.flock02_32bit',
+    'syscalls.flock02_64bit',
+    'syscalls.flock03_32bit',
+    'syscalls.flock03_64bit',
+    'syscalls.flock04_32bit',
+    'syscalls.flock04_64bit',
+    'syscalls.flock05_32bit',
+    'syscalls.flock05_64bit',
+    'syscalls.flock06_32bit',
+    'syscalls.flock06_64bit',
+    'syscalls.fork01_32bit',
+    'syscalls.fork01_64bit',
+    'syscalls.fork02_32bit',
+    'syscalls.fork02_64bit',
+    'syscalls.fork03_32bit',
+    'syscalls.fork03_64bit',
+    'syscalls.fork04_32bit',
+    'syscalls.fork04_64bit',
+    'syscalls.fork05_32bit',
+    'syscalls.fork05_64bit',
+    'syscalls.fork06_32bit',
+    'syscalls.fork06_64bit',
+    'syscalls.fork07_32bit',
+    'syscalls.fork07_64bit',
+    'syscalls.fork08_32bit',
+    'syscalls.fork08_64bit',
+    'syscalls.fork09_32bit',
+    'syscalls.fork09_64bit',
+    'syscalls.fork10_32bit',
+    'syscalls.fork10_64bit',
+    'syscalls.fork11_32bit',
+    'syscalls.fork11_64bit',
+    'syscalls.fpathconf01_32bit',
+    'syscalls.fpathconf01_64bit',
+    'syscalls.fstat01_32bit',
+    'syscalls.fstat01_64_32bit',
+    'syscalls.fstat01_64_64bit',
+    'syscalls.fstat01_64bit',
+    'syscalls.fstat02_32bit',
+    'syscalls.fstat02_64_32bit',
+    'syscalls.fstat02_64_64bit',
+    'syscalls.fstat02_64bit',
+    'syscalls.fstat03_32bit',
+    'syscalls.fstat03_64_32bit',
+    'syscalls.fstat03_64_64bit',
+    'syscalls.fstat03_64bit',
+    'syscalls.fstat05_32bit',
+    'syscalls.fstat05_64_32bit',
+    'syscalls.fstat05_64_64bit',
+    'syscalls.fstat05_64bit',
+    'syscalls.fstatat01_32bit',
+    'syscalls.fstatat01_64bit',
+    'syscalls.fstatfs01_32bit',
+    'syscalls.fstatfs01_64_32bit',
+    'syscalls.fstatfs01_64_64bit',
+    'syscalls.fstatfs01_64bit',
+    'syscalls.fstatfs02_32bit',
+    'syscalls.fstatfs02_64_32bit',
+    'syscalls.fstatfs02_64_64bit',
+    'syscalls.fstatfs02_64bit',
+    'syscalls.fsync02_32bit',
+    'syscalls.fsync02_64bit',
+    'syscalls.fsync03_32bit',
+    'syscalls.fsync03_64bit',
+    'syscalls.ftruncate01_32bit',
+    'syscalls.ftruncate01_64_32bit',
+    'syscalls.ftruncate01_64_64bit',
+    'syscalls.ftruncate01_64bit',
+    'syscalls.ftruncate02_32bit',
+    'syscalls.ftruncate02_64_32bit',
+    'syscalls.ftruncate02_64_64bit',
+    'syscalls.ftruncate02_64bit',
+    'syscalls.ftruncate03_32bit',
+    'syscalls.ftruncate03_64_32bit',
+    'syscalls.ftruncate03_64_64bit',
+    'syscalls.ftruncate03_64bit',
+    'syscalls.futex_wait01_32bit',
+    'syscalls.futex_wait01_64bit',
+    'syscalls.futex_wait03_32bit',
+    'syscalls.futex_wait03_64bit',
+    'syscalls.futex_wait04_32bit',
+    'syscalls.futex_wait04_64bit',
+    'syscalls.futex_wait05_32bit',
+    'syscalls.futex_wait05_64bit',
+    'syscalls.futex_wait_bitset01_32bit',
+    'syscalls.futex_wait_bitset01_64bit',
+    'syscalls.futex_wait_bitset02_32bit',
+    'syscalls.futex_wait_bitset02_64bit',
+    'syscalls.futex_wake01_32bit',
+    'syscalls.futex_wake01_64bit',
+    'syscalls.futex_wake02_32bit',
+    'syscalls.futex_wake02_64bit',
+    'syscalls.futimesat01_32bit',
+    'syscalls.futimesat01_64bit',
+    'syscalls.get_robust_list01_32bit',
+    'syscalls.get_robust_list01_64bit',
+    'syscalls.getcwd04_32bit',
+    'syscalls.getcwd04_64bit',
+    'syscalls.getdents01_32bit',
+    'syscalls.getdents01_64_32bit',
+    'syscalls.getdents01_64_64bit',
+    'syscalls.getdents01_64bit',
+    'syscalls.getdents02_32bit',
+    'syscalls.getdents02_64_32bit',
+    'syscalls.getdents02_64_64bit',
+    'syscalls.getdents02_64bit',
+    'syscalls.getdtablesize01_32bit',
+    'syscalls.getdtablesize01_64bit',
+    'syscalls.gethostname01_32bit',
+    'syscalls.gethostname01_64bit',
+    'syscalls.getitimer01_32bit',
+    'syscalls.getitimer01_64bit',
+    'syscalls.getitimer02_32bit',
+    'syscalls.getitimer02_64bit',
+    'syscalls.getitimer03_32bit',
+    'syscalls.getitimer03_64bit',
+    'syscalls.getpagesize01_32bit',
+    'syscalls.getpagesize01_64bit',
+    'syscalls.getpeername01_32bit',
+    'syscalls.getpeername01_64bit',
+    'syscalls.getpgid01_32bit',
+    'syscalls.getpgid01_64bit',
+    'syscalls.getpgid02_32bit',
+    'syscalls.getpgid02_64bit',
+    'syscalls.getpgrp01_32bit',
+    'syscalls.getpgrp01_64bit',
+    'syscalls.getpid01_32bit',
+    'syscalls.getpid01_64bit',
+    'syscalls.getpid02_32bit',
+    'syscalls.getpid02_64bit',
+    'syscalls.getppid01_32bit',
+    'syscalls.getppid01_64bit',
+    'syscalls.getppid02_32bit',
+    'syscalls.getppid02_64bit',
+    'syscalls.getpriority01_32bit',
+    'syscalls.getpriority01_64bit',
+    'syscalls.getpriority02_32bit',
+    'syscalls.getpriority02_64bit',
+    'syscalls.getrandom01_32bit',
+    'syscalls.getrandom01_64bit',
+    'syscalls.getrandom02_32bit',
+    'syscalls.getrandom02_64bit',
+    'syscalls.getrandom03_32bit',
+    'syscalls.getrandom03_64bit',
+    'syscalls.getrandom04_32bit',
+    'syscalls.getrandom04_64bit',
+    'syscalls.getresgid01_32bit',
+    'syscalls.getresgid01_64bit',
+    'syscalls.getresgid02_32bit',
+    'syscalls.getresgid02_64bit',
+    'syscalls.getresgid03_32bit',
+    'syscalls.getresgid03_64bit',
+    'syscalls.getresuid01_32bit',
+    'syscalls.getresuid01_64bit',
+    'syscalls.getresuid02_32bit',
+    'syscalls.getresuid02_64bit',
+    'syscalls.getresuid03_32bit',
+    'syscalls.getresuid03_64bit',
+    'syscalls.getrlimit01_32bit',
+    'syscalls.getrlimit01_64bit',
+    'syscalls.getrlimit02_32bit',
+    'syscalls.getrlimit02_64bit',
+    'syscalls.getrusage01_32bit',
+    'syscalls.getrusage01_64bit',
+    'syscalls.getrusage02_32bit',
+    'syscalls.getrusage02_64bit',
+    'syscalls.getrusage03_32bit',
+    'syscalls.getrusage03_64bit',
+    'syscalls.getsid01_32bit',
+    'syscalls.getsid01_64bit',
+    'syscalls.getsid02_32bit',
+    'syscalls.getsid02_64bit',
+    'syscalls.getsockname01_32bit',
+    'syscalls.getsockname01_64bit',
+    'syscalls.getsockopt01_32bit',
+    'syscalls.getsockopt01_64bit',
+    'syscalls.gettid01_32bit',
+    'syscalls.gettid01_64bit',
+    'syscalls.gettimeofday01_32bit',
+    'syscalls.gettimeofday01_64bit',
+    'syscalls.gettimeofday02_32bit',
+    'syscalls.gettimeofday02_64bit',
+    'syscalls.inotify01_32bit',
+    'syscalls.inotify01_64bit',
+    'syscalls.inotify02_32bit',
+    'syscalls.inotify02_64bit',
+    'syscalls.inotify04_32bit',
+    'syscalls.inotify04_64bit',
+    'syscalls.inotify05_32bit',
+    'syscalls.inotify05_64bit',
+    'syscalls.inotify_init1_01_32bit',
+    'syscalls.inotify_init1_01_64bit',
+    'syscalls.inotify_init1_02_32bit',
+    'syscalls.inotify_init1_02_64bit',
+    'syscalls.ioctl01_02_32bit',
+    'syscalls.ioctl01_02_64bit',
+    'syscalls.ioperm01_32bit',
+    'syscalls.ioperm01_64bit',
+    'syscalls.ioperm02_32bit',
+    'syscalls.ioperm02_64bit',
+    'syscalls.iopl01_32bit',
+    'syscalls.iopl01_64bit',
+    'syscalls.iopl02_32bit',
+    'syscalls.iopl02_64bit',
+    'syscalls.kill01_32bit',
+    'syscalls.kill01_64bit',
+    'syscalls.kill02_32bit',
+    'syscalls.kill02_64bit',
+    'syscalls.kill03_32bit',
+    'syscalls.kill03_64bit',
+    'syscalls.kill04_32bit',
+    'syscalls.kill04_64bit',
+    'syscalls.kill06_32bit',
+    'syscalls.kill06_64bit',
+    'syscalls.kill08_32bit',
+    'syscalls.kill08_64bit',
+    'syscalls.kill09_32bit',
+    'syscalls.kill09_64bit',
+    'syscalls.kill10_32bit',
+    'syscalls.kill10_64bit',
+    'syscalls.link01_32bit',
+    'syscalls.link01_64bit',
+    'syscalls.link02_32bit',
+    'syscalls.link02_64bit',
+    'syscalls.link03_32bit',
+    'syscalls.link03_64bit',
+    'syscalls.link04_32bit',
+    'syscalls.link04_64bit',
+    'syscalls.link05_32bit',
+    'syscalls.link05_64bit',
+    'syscalls.link06_32bit',
+    'syscalls.link06_64bit',
+    'syscalls.link07_32bit',
+    'syscalls.link07_64bit',
+    'syscalls.linkat01_32bit',
+    'syscalls.linkat01_64bit',
+    'syscalls.listen01_32bit',
+    'syscalls.listen01_64bit',
+    'syscalls.llseek01_32bit',
+    'syscalls.llseek01_64bit',
+    'syscalls.llseek02_32bit',
+    'syscalls.llseek02_64bit',
+    'syscalls.llseek03_32bit',
+    'syscalls.llseek03_64bit',
+    'syscalls.lseek01_32bit',
+    'syscalls.lseek01_64bit',
+    'syscalls.lseek02_32bit',
+    'syscalls.lseek02_64bit',
+    'syscalls.lseek03_32bit',
+    'syscalls.lseek03_64bit',
+    'syscalls.lseek04_32bit',
+    'syscalls.lseek04_64bit',
+    'syscalls.lseek05_32bit',
+    'syscalls.lseek05_64bit',
+    'syscalls.lseek06_32bit',
+    'syscalls.lseek06_64bit',
+    'syscalls.lseek07_32bit',
+    'syscalls.lseek07_64bit',
+    'syscalls.lseek08_32bit',
+    'syscalls.lseek08_64bit',
+    'syscalls.lseek09_32bit',
+    'syscalls.lseek09_64bit',
+    'syscalls.lseek10_32bit',
+    'syscalls.lseek10_64bit',
+    'syscalls.lstat01A_32bit',
+    'syscalls.lstat01A_64_32bit',
+    'syscalls.lstat01A_64_64bit',
+    'syscalls.lstat01A_64bit',
+    'syscalls.lstat01_32bit',
+    'syscalls.lstat01_64_32bit',
+    'syscalls.lstat01_64_64bit',
+    'syscalls.lstat01_64bit',
+    'syscalls.lstat02_32bit',
+    'syscalls.lstat02_64_32bit',
+    'syscalls.lstat02_64_64bit',
+    'syscalls.lstat02_64bit',
+    'syscalls.madvise05_32bit',
+    'syscalls.madvise05_64bit',
+    'syscalls.memcmp01_32bit',
+    'syscalls.memcmp01_64bit',
+    'syscalls.memcpy01_32bit',
+    'syscalls.memcpy01_64bit',
+    'syscalls.memset01_32bit',
+    'syscalls.memset01_64bit',
+    'syscalls.mincore01_32bit',
+    'syscalls.mincore01_64bit',
+    'syscalls.mincore02_32bit',
+    'syscalls.mincore02_64bit',
+    'syscalls.mkdir01_32bit',
+    'syscalls.mkdir01_64bit',
+    'syscalls.mkdir02_32bit',
+    'syscalls.mkdir02_64bit',
+    'syscalls.mkdir04_32bit',
+    'syscalls.mkdir04_64bit',
+    'syscalls.mkdir05A_32bit',
+    'syscalls.mkdir05A_64bit',
+    'syscalls.mkdir05_32bit',
+    'syscalls.mkdir05_64bit',
+    'syscalls.mkdir08_32bit',
+    'syscalls.mkdir08_64bit',
+    'syscalls.mkdir09_32bit',
+    'syscalls.mkdir09_64bit',
+    'syscalls.mkdirat01_32bit',
+    'syscalls.mkdirat01_64bit',
+    'syscalls.mknod01_32bit',
+    'syscalls.mknod01_64bit',
+    'syscalls.mknod02_32bit',
+    'syscalls.mknod02_64bit',
+    'syscalls.mknod03_32bit',
+    'syscalls.mknod03_64bit',
+    'syscalls.mknod04_32bit',
+    'syscalls.mknod04_64bit',
+    'syscalls.mknod05_32bit',
+    'syscalls.mknod05_64bit',
+    'syscalls.mknod06_32bit',
+    'syscalls.mknod06_64bit',
+    'syscalls.mknod08_32bit',
+    'syscalls.mknod08_64bit',
+    'syscalls.mknod09_32bit',
+    'syscalls.mknod09_64bit',
+    'syscalls.mknodat01_32bit',
+    'syscalls.mknodat01_64bit',
+    'syscalls.mlock01_32bit',
+    'syscalls.mlock01_64bit',
+    'syscalls.mlock02_32bit',
+    'syscalls.mlock02_64bit',
+    'syscalls.mlock03_32bit',
+    'syscalls.mlock03_64bit',
+    'syscalls.mlock04_32bit',
+    'syscalls.mlock04_64bit',
+    'syscalls.mlockall01_32bit',
+    'syscalls.mlockall01_64bit',
+    'syscalls.mlockall02_32bit',
+    'syscalls.mlockall02_64bit',
+    'syscalls.mlockall03_32bit',
+    'syscalls.mlockall03_64bit',
+    'syscalls.mmap01_32bit',
+    'syscalls.mmap01_64bit',
+    'syscalls.mmap02_32bit',
+    'syscalls.mmap02_64bit',
+    'syscalls.mmap03_32bit',
+    'syscalls.mmap03_64bit',
+    'syscalls.mmap04_32bit',
+    'syscalls.mmap04_64bit',
+    'syscalls.mmap05_32bit',
+    'syscalls.mmap05_64bit',
+    'syscalls.mmap06_32bit',
+    'syscalls.mmap06_64bit',
+    'syscalls.mmap07_32bit',
+    'syscalls.mmap07_64bit',
+    'syscalls.mmap08_32bit',
+    'syscalls.mmap08_64bit',
+    'syscalls.mmap09_32bit',
+    'syscalls.mmap09_64bit',
+    'syscalls.mmap12_32bit',
+    'syscalls.mmap12_64bit',
+    'syscalls.mmap13_32bit',
+    'syscalls.mmap13_64bit',
+    'syscalls.mmap14_32bit',
+    'syscalls.mmap14_64bit',
+    'syscalls.modify_ldt01_32bit',
+    'syscalls.modify_ldt01_64bit',
+    'syscalls.modify_ldt02_32bit',
+    'syscalls.modify_ldt02_64bit',
+    'syscalls.modify_ldt03_32bit',
+    'syscalls.modify_ldt03_64bit',
+    'syscalls.mount05_32bit',
+    'syscalls.mount05_64bit',
+    'syscalls.mprotect02_32bit',
+    'syscalls.mprotect02_64bit',
+    'syscalls.mprotect03_32bit',
+    'syscalls.mprotect03_64bit',
+    'syscalls.mprotect04_32bit',
+    'syscalls.mprotect04_64bit',
+    'syscalls.mremap01_32bit',
+    'syscalls.mremap01_64bit',
+    'syscalls.mremap02_32bit',
+    'syscalls.mremap02_64bit',
+    'syscalls.mremap03_32bit',
+    'syscalls.mremap03_64bit',
+    'syscalls.mremap05_32bit',
+    'syscalls.mremap05_64bit',
+    'syscalls.msync01_32bit',
+    'syscalls.msync01_64bit',
+    'syscalls.msync02_32bit',
+    'syscalls.msync02_64bit',
+    'syscalls.msync03_32bit',
+    'syscalls.msync03_64bit',
+    'syscalls.munlock01_32bit',
+    'syscalls.munlock01_64bit',
+    'syscalls.munlock02_32bit',
+    'syscalls.munlock02_64bit',
+    'syscalls.munlockall01_32bit',
+    'syscalls.munlockall01_64bit',
+    'syscalls.munmap01_32bit',
+    'syscalls.munmap01_64bit',
+    'syscalls.munmap02_32bit',
+    'syscalls.munmap02_64bit',
+    'syscalls.munmap03_32bit',
+    'syscalls.munmap03_64bit',
+    'syscalls.nanosleep01_32bit',
+    'syscalls.nanosleep01_64bit',
+    'syscalls.nanosleep02_32bit',
+    'syscalls.nanosleep02_64bit',
+    'syscalls.nanosleep03_32bit',
+    'syscalls.nanosleep03_64bit',
+    'syscalls.nanosleep04_32bit',
+    'syscalls.nanosleep04_64bit',
+    'syscalls.newuname01_32bit',
+    'syscalls.newuname01_64bit',
+    'syscalls.nice01_32bit',
+    'syscalls.nice01_64bit',
+    'syscalls.nice02_32bit',
+    'syscalls.nice02_64bit',
+    'syscalls.nice03_32bit',
+    'syscalls.nice03_64bit',
+    'syscalls.nice05_32bit',
+    'syscalls.nice05_64bit',
+    'syscalls.open01A_32bit',
+    'syscalls.open01A_64bit',
+    'syscalls.open02_32bit',
+    'syscalls.open02_64bit',
+    'syscalls.open03_32bit',
+    'syscalls.open03_64bit',
+    'syscalls.open04_32bit',
+    'syscalls.open04_64bit',
+    'syscalls.open05_32bit',
+    'syscalls.open05_64bit',
+    'syscalls.open06_32bit',
+    'syscalls.open06_64bit',
+    'syscalls.open07_32bit',
+    'syscalls.open07_64bit',
+    'syscalls.open09_32bit',
+    'syscalls.open09_64bit',
+    'syscalls.openat01_32bit',
+    'syscalls.openat01_64bit',
+    'syscalls.pause01_32bit',
+    'syscalls.pause01_64bit',
+    'syscalls.pause02_32bit',
+    'syscalls.pause02_64bit',
+    'syscalls.pause03_32bit',
+    'syscalls.pause03_64bit',
+    'syscalls.perf_event_open01_32bit',
+    'syscalls.perf_event_open01_64bit',
+    'syscalls.personality01_32bit',
+    'syscalls.personality01_64bit',
+    'syscalls.personality02_32bit',
+    'syscalls.personality02_64bit',
+    'syscalls.pipe01_32bit',
+    'syscalls.pipe01_64bit',
+    'syscalls.pipe02_32bit',
+    'syscalls.pipe02_64bit',
+    'syscalls.pipe03_32bit',
+    'syscalls.pipe03_64bit',
+    'syscalls.pipe04_32bit',
+    'syscalls.pipe04_64bit',
+    'syscalls.pipe05_32bit',
+    'syscalls.pipe05_64bit',
+    'syscalls.pipe06_32bit',
+    'syscalls.pipe06_64bit',
+    'syscalls.pipe07_32bit',
+    'syscalls.pipe07_64bit',
+    'syscalls.pipe08_32bit',
+    'syscalls.pipe08_64bit',
+    'syscalls.pipe09_32bit',
+    'syscalls.pipe09_64bit',
+    'syscalls.pipe10_32bit',
+    'syscalls.pipe10_64bit',
+    'syscalls.pipe11_32bit',
+    'syscalls.pipe11_64bit',
+    'syscalls.pipe2_01_32bit',
+    'syscalls.pipe2_01_64bit',
+    'syscalls.pipe2_02_32bit',
+    'syscalls.pipe2_02_64bit',
+    'syscalls.poll01_32bit',
+    'syscalls.poll01_64bit',
+    'syscalls.poll02_32bit',
+    'syscalls.poll02_64bit',
+    'syscalls.posix_fadvise01_32bit',
+    'syscalls.posix_fadvise01_64_32bit',
+    'syscalls.posix_fadvise01_64_64bit',
+    'syscalls.posix_fadvise01_64bit',
+    'syscalls.posix_fadvise02_32bit',
+    'syscalls.posix_fadvise02_64_32bit',
+    'syscalls.posix_fadvise02_64_64bit',
+    'syscalls.posix_fadvise02_64bit',
+    'syscalls.posix_fadvise03_32bit',
+    'syscalls.posix_fadvise03_64_32bit',
+    'syscalls.posix_fadvise03_64_64bit',
+    'syscalls.posix_fadvise03_64bit',
+    'syscalls.posix_fadvise04_32bit',
+    'syscalls.posix_fadvise04_64_32bit',
+    'syscalls.posix_fadvise04_64_64bit',
+    'syscalls.posix_fadvise04_64bit',
+    'syscalls.ppoll01_32bit',
+    'syscalls.ppoll01_64bit',
+    'syscalls.prctl01_32bit',
+    'syscalls.prctl01_64bit',
+    'syscalls.prctl02_32bit',
+    'syscalls.prctl02_64bit',
+    'syscalls.pread01_32bit',
+    'syscalls.pread01_64_32bit',
+    'syscalls.pread01_64_64bit',
+    'syscalls.pread01_64bit',
+    'syscalls.pread02_32bit',
+    'syscalls.pread02_64_32bit',
+    'syscalls.pread02_64_64bit',
+    'syscalls.pread02_64bit',
+    'syscalls.pread03_32bit',
+    'syscalls.pread03_64_32bit',
+    'syscalls.pread03_64_64bit',
+    'syscalls.pread03_64bit',
+    'syscalls.preadv01_32bit',
+    'syscalls.preadv01_64_32bit',
+    'syscalls.preadv01_64_64bit',
+    'syscalls.preadv01_64bit',
+    'syscalls.preadv02_64_32bit',
+    'syscalls.preadv02_64_64bit',
+    'syscalls.pselect02_32bit',
+    'syscalls.pselect02_64_32bit',
+    'syscalls.pselect02_64_64bit',
+    'syscalls.pselect02_64bit',
+    'syscalls.ptrace01_32bit',
+    'syscalls.ptrace01_64bit',
+    'syscalls.ptrace02_32bit',
+    'syscalls.ptrace02_64bit',
+    'syscalls.ptrace03_32bit',
+    'syscalls.ptrace03_64bit',
+    'syscalls.ptrace05_32bit',
+    'syscalls.ptrace05_64bit',
+    'syscalls.pwrite01_32bit',
+    'syscalls.pwrite01_64_32bit',
+    'syscalls.pwrite01_64_64bit',
+    'syscalls.pwrite01_64bit',
+    'syscalls.pwrite02_32bit',
+    'syscalls.pwrite02_64_32bit',
+    'syscalls.pwrite02_64_64bit',
+    'syscalls.pwrite02_64bit',
+    'syscalls.pwrite04_32bit',
+    'syscalls.pwrite04_64_32bit',
+    'syscalls.pwrite04_64_64bit',
+    'syscalls.pwrite04_64bit',
+    'syscalls.pwritev01_32bit',
+    'syscalls.pwritev01_64bit',
+    'syscalls.pwritev02_64_32bit',
+    'syscalls.pwritev02_64_64bit',
+    'syscalls.qmm01_32bit',
+    'syscalls.qmm01_64bit',
+    'syscalls.read01_32bit',
+    'syscalls.read01_64bit',
+    'syscalls.read02_32bit',
+    'syscalls.read02_64bit',
+    'syscalls.read03_32bit',
+    'syscalls.read03_64bit',
+    'syscalls.read04_32bit',
+    'syscalls.read04_64bit',
+    'syscalls.readahead01_32bit',
+    'syscalls.readahead01_64bit',
+    'syscalls.readahead02_32bit',
+    'syscalls.readahead02_64bit',
+    'syscalls.readdir01_32bit',
+    'syscalls.readdir01_64bit',
+    'syscalls.readlink01A_32bit',
+    'syscalls.readlink01A_64bit',
+    'syscalls.readlink01_32bit',
+    'syscalls.readlink01_64bit',
+    'syscalls.readlink02_32bit',
+    'syscalls.readlink02_64bit',
+    'syscalls.readlink03_32bit',
+    'syscalls.readlink03_64bit',
+    'syscalls.readlinkat01_32bit',
+    'syscalls.readlinkat01_64bit',
+    'syscalls.readlinkat02_32bit',
+    'syscalls.readlinkat02_64bit',
+    'syscalls.readv01_32bit',
+    'syscalls.readv01_64bit',
+    'syscalls.readv02_32bit',
+    'syscalls.readv02_64bit',
+    'syscalls.readv03_32bit',
+    'syscalls.readv03_64bit',
+    'syscalls.reboot01_32bit',
+    'syscalls.reboot01_64bit',
+    'syscalls.reboot02_32bit',
+    'syscalls.reboot02_64bit',
+    'syscalls.recv01_32bit',
+    'syscalls.recv01_64bit',
+    'syscalls.recvfrom01_32bit',
+    'syscalls.recvfrom01_64bit',
+    'syscalls.recvmsg01_32bit',
+    'syscalls.recvmsg01_64bit',
+    'syscalls.recvmsg02_32bit',
+    'syscalls.recvmsg02_64bit',
+    'syscalls.rename01A_32bit',
+    'syscalls.rename01A_64bit',
+    'syscalls.rename01_32bit',
+    'syscalls.rename01_64bit',
+    'syscalls.rename02_32bit',
+    'syscalls.rename02_64bit',
+    'syscalls.rename03_32bit',
+    'syscalls.rename03_64bit',
+    'syscalls.rename04_32bit',
+    'syscalls.rename04_64bit',
+    'syscalls.rename05_32bit',
+    'syscalls.rename05_64bit',
+    'syscalls.rename06_32bit',
+    'syscalls.rename06_64bit',
+    'syscalls.rename07_32bit',
+    'syscalls.rename07_64bit',
+    'syscalls.rename08_32bit',
+    'syscalls.rename08_64bit',
+    'syscalls.rename09_32bit',
+    'syscalls.rename09_64bit',
+    'syscalls.rename10_32bit',
+    'syscalls.rename10_64bit',
+    'syscalls.rename12_32bit',
+    'syscalls.rename12_64bit',
+    'syscalls.rename13_32bit',
+    'syscalls.rename13_64bit',
+    'syscalls.rename14_32bit',
+    'syscalls.rename14_64bit',
+    'syscalls.renameat201_32bit',
+    'syscalls.renameat201_64bit',
+    'syscalls.renameat202_32bit',
+    'syscalls.renameat202_64bit',
+    'syscalls.rmdir01_32bit',
+    'syscalls.rmdir01_64bit',
+    'syscalls.rmdir03A_32bit',
+    'syscalls.rmdir03A_64bit',
+    'syscalls.rmdir03_32bit',
+    'syscalls.rmdir03_64bit',
+    'syscalls.rmdir04_32bit',
+    'syscalls.rmdir04_64bit',
+    'syscalls.rmdir05_32bit',
+    'syscalls.rmdir05_64bit',
+    'syscalls.rt_sigaction01_32bit',
+    'syscalls.rt_sigaction01_64bit',
+    'syscalls.rt_sigaction02_32bit',
+    'syscalls.rt_sigaction02_64bit',
+    'syscalls.rt_sigaction03_32bit',
+    'syscalls.rt_sigaction03_64bit',
+    'syscalls.rt_sigprocmask02_32bit',
+    'syscalls.rt_sigprocmask02_64bit',
+    'syscalls.rt_sigqueueinfo01_32bit',
+    'syscalls.rt_sigqueueinfo01_64bit',
+    'syscalls.sbrk01_32bit',
+    'syscalls.sbrk01_64bit',
+    'syscalls.sbrk02_32bit',
+    'syscalls.sbrk02_64bit',
+    'syscalls.sched_get_priority_max01_32bit',
+    'syscalls.sched_get_priority_max01_64bit',
+    'syscalls.sched_get_priority_max02_32bit',
+    'syscalls.sched_get_priority_max02_64bit',
+    'syscalls.sched_get_priority_min01_32bit',
+    'syscalls.sched_get_priority_min01_64bit',
+    'syscalls.sched_get_priority_min02_32bit',
+    'syscalls.sched_get_priority_min02_64bit',
+    'syscalls.sched_getaffinity01_32bit',
+    'syscalls.sched_getaffinity01_64bit',
+    'syscalls.sched_getattr01_32bit',
+    'syscalls.sched_getattr01_64bit',
+    'syscalls.sched_getattr02_32bit',
+    'syscalls.sched_getattr02_64bit',
+    'syscalls.sched_getparam01_32bit',
+    'syscalls.sched_getparam01_64bit',
+    'syscalls.sched_getparam02_32bit',
+    'syscalls.sched_getparam02_64bit',
+    'syscalls.sched_getparam03_32bit',
+    'syscalls.sched_getparam03_64bit',
+    'syscalls.sched_getscheduler01_32bit',
+    'syscalls.sched_getscheduler01_64bit',
+    'syscalls.sched_getscheduler02_32bit',
+    'syscalls.sched_getscheduler02_64bit',
+    'syscalls.sched_rr_get_interval01_32bit',
+    'syscalls.sched_rr_get_interval01_64bit',
+    'syscalls.sched_rr_get_interval02_32bit',
+    'syscalls.sched_rr_get_interval02_64bit',
+    'syscalls.sched_rr_get_interval03_32bit',
+    'syscalls.sched_rr_get_interval03_64bit',
+    'syscalls.sched_setaffinity01_32bit',
+    'syscalls.sched_setaffinity01_64bit',
+    'syscalls.sched_setattr01_32bit',
+    'syscalls.sched_setattr01_64bit',
+    'syscalls.sched_setparam01_32bit',
+    'syscalls.sched_setparam01_64bit',
+    'syscalls.sched_setparam02_32bit',
+    'syscalls.sched_setparam02_64bit',
+    'syscalls.sched_setparam03_32bit',
+    'syscalls.sched_setparam03_64bit',
+    'syscalls.sched_setparam04_32bit',
+    'syscalls.sched_setparam04_64bit',
+    'syscalls.sched_setparam05_32bit',
+    'syscalls.sched_setparam05_64bit',
+    'syscalls.sched_setscheduler01_32bit',
+    'syscalls.sched_setscheduler01_64bit',
+    'syscalls.sched_setscheduler02_32bit',
+    'syscalls.sched_setscheduler02_64bit',
+    'syscalls.sched_yield01_32bit',
+    'syscalls.sched_yield01_64bit',
+    'syscalls.select01_32bit',
+    'syscalls.select01_64bit',
+    'syscalls.select02_32bit',
+    'syscalls.select02_64bit',
+    'syscalls.select03_32bit',
+    'syscalls.select03_64bit',
+    'syscalls.select04_32bit',
+    'syscalls.select04_64bit',
+    'syscalls.send01_32bit',
+    'syscalls.send01_64bit',
+    'syscalls.sendfile02_32bit',
+    'syscalls.sendfile02_64_32bit',
+    'syscalls.sendfile02_64_64bit',
+    'syscalls.sendfile02_64bit',
+    'syscalls.sendfile03_32bit',
+    'syscalls.sendfile03_64_32bit',
+    'syscalls.sendfile03_64_64bit',
+    'syscalls.sendfile03_64bit',
+    'syscalls.sendfile04_32bit',
+    'syscalls.sendfile04_64_32bit',
+    'syscalls.sendfile04_64_64bit',
+    'syscalls.sendfile04_64bit',
+    'syscalls.sendfile05_32bit',
+    'syscalls.sendfile05_64_32bit',
+    'syscalls.sendfile05_64_64bit',
+    'syscalls.sendfile05_64bit',
+    'syscalls.sendfile06_32bit',
+    'syscalls.sendfile06_64_32bit',
+    'syscalls.sendfile06_64_64bit',
+    'syscalls.sendfile06_64bit',
+    'syscalls.sendfile07_32bit',
+    'syscalls.sendfile07_64_32bit',
+    'syscalls.sendfile07_64_64bit',
+    'syscalls.sendfile07_64bit',
+    'syscalls.sendfile08_32bit',
+    'syscalls.sendfile08_64_32bit',
+    'syscalls.sendfile08_64_64bit',
+    'syscalls.sendfile08_64bit',
+    'syscalls.sendmsg01_32bit',
+    'syscalls.sendmsg01_64bit',
+    'syscalls.sendto01_32bit',
+    'syscalls.sendto01_64bit',
+    'syscalls.set_robust_list01_32bit',
+    'syscalls.set_robust_list01_64bit',
+    'syscalls.set_tid_address01_32bit',
+    'syscalls.set_tid_address01_64bit',
+    'syscalls.setegid01_32bit',
+    'syscalls.setegid01_64bit',
+    'syscalls.setegid02_32bit',
+    'syscalls.setegid02_64bit',
+    'syscalls.sethostname01_32bit',
+    'syscalls.sethostname01_64bit',
+    'syscalls.sethostname02_32bit',
+    'syscalls.sethostname02_64bit',
+    'syscalls.sethostname03_32bit',
+    'syscalls.sethostname03_64bit',
+    'syscalls.setitimer01_32bit',
+    'syscalls.setitimer01_64bit',
+    'syscalls.setitimer02_32bit',
+    'syscalls.setitimer02_64bit',
+    'syscalls.setitimer03_32bit',
+    'syscalls.setitimer03_64bit',
+    'syscalls.setns01_32bit',
+    'syscalls.setns01_64bit',
+    'syscalls.setpgid01_32bit',
+    'syscalls.setpgid01_64bit',
+    'syscalls.setpgid02_32bit',
+    'syscalls.setpgid02_64bit',
+    'syscalls.setpgid03_32bit',
+    'syscalls.setpgid03_64bit',
+    'syscalls.setpgrp01_32bit',
+    'syscalls.setpgrp01_64bit',
+    'syscalls.setpgrp02_32bit',
+    'syscalls.setpgrp02_64bit',
+    'syscalls.setpriority01_32bit',
+    'syscalls.setpriority01_64bit',
+    'syscalls.setpriority03_32bit',
+    'syscalls.setpriority03_64bit',
+    'syscalls.setpriority04_32bit',
+    'syscalls.setpriority04_64bit',
+    'syscalls.setpriority05_32bit',
+    'syscalls.setpriority05_64bit',
+    'syscalls.setrlimit01_32bit',
+    'syscalls.setrlimit01_64bit',
+    'syscalls.setrlimit02_32bit',
+    'syscalls.setrlimit02_64bit',
+    'syscalls.setrlimit03_32bit',
+    'syscalls.setrlimit03_64bit',
+    'syscalls.setsid01_32bit',
+    'syscalls.setsid01_64bit',
+    'syscalls.setsockopt01_32bit',
+    'syscalls.setsockopt01_64bit',
+    'syscalls.settimeofday01_32bit',
+    'syscalls.settimeofday01_64bit',
+    'syscalls.settimeofday02_32bit',
+    'syscalls.settimeofday02_64bit',
+    'syscalls.sigaction01_32bit',
+    'syscalls.sigaction01_64bit',
+    'syscalls.sigaction02_32bit',
+    'syscalls.sigaction02_64bit',
+    'syscalls.sigaltstack01_32bit',
+    'syscalls.sigaltstack01_64bit',
+    'syscalls.sigaltstack02_32bit',
+    'syscalls.sigaltstack02_64bit',
+    'syscalls.signal01_32bit',
+    'syscalls.signal01_64bit',
+    'syscalls.signal02_32bit',
+    'syscalls.signal02_64bit',
+    'syscalls.signal03_32bit',
+    'syscalls.signal03_64bit',
+    'syscalls.signal04_32bit',
+    'syscalls.signal04_64bit',
+    'syscalls.signal05_32bit',
+    'syscalls.signal05_64bit',
+    'syscalls.signalfd01_32bit',
+    'syscalls.signalfd01_64bit',
+    'syscalls.signalfd4_01_32bit',
+    'syscalls.signalfd4_01_64bit',
+    'syscalls.signalfd4_02_32bit',
+    'syscalls.signalfd4_02_64bit',
+    'syscalls.sigprocmask01_32bit',
+    'syscalls.sigprocmask01_64bit',
+    'syscalls.socket01_32bit',
+    'syscalls.socket01_64bit',
+    'syscalls.socket02_32bit',
+    'syscalls.socket02_64bit',
+    'syscalls.socket03_32bit',
+    'syscalls.socket03_64bit',
+    'syscalls.socketcall01_32bit',
+    'syscalls.socketcall01_64bit',
+    'syscalls.socketcall02_32bit',
+    'syscalls.socketcall02_64bit',
+    'syscalls.socketcall03_32bit',
+    'syscalls.socketcall03_64bit',
+    'syscalls.socketcall04_32bit',
+    'syscalls.socketcall04_64bit',
+    'syscalls.socketpair01_32bit',
+    'syscalls.socketpair01_64bit',
+    'syscalls.socketpair02_32bit',
+    'syscalls.socketpair02_64bit',
+    'syscalls.splice01_32bit',
+    'syscalls.splice01_64bit',
+    'syscalls.splice03_32bit',
+    'syscalls.splice03_64bit',
+    'syscalls.stat01_32bit',
+    'syscalls.stat01_64_32bit',
+    'syscalls.stat01_64_64bit',
+    'syscalls.stat01_64bit',
+    'syscalls.stat02_32bit',
+    'syscalls.stat02_64_32bit',
+    'syscalls.stat02_64_64bit',
+    'syscalls.stat02_64bit',
+    'syscalls.stat03_32bit',
+    'syscalls.stat03_64_32bit',
+    'syscalls.stat03_64_64bit',
+    'syscalls.stat03_64bit',
+    'syscalls.stat04_32bit',
+    'syscalls.stat04_64_32bit',
+    'syscalls.stat04_64_64bit',
+    'syscalls.stat04_64bit',
+    'syscalls.stat05_32bit',
+    'syscalls.stat05_64_32bit',
+    'syscalls.stat05_64_64bit',
+    'syscalls.stat05_64bit',
+    'syscalls.stat06_32bit',
+    'syscalls.stat06_64_32bit',
+    'syscalls.stat06_64_64bit',
+    'syscalls.stat06_64bit',
+    'syscalls.statfs01_32bit',
+    'syscalls.statfs01_64_32bit',
+    'syscalls.statfs01_64_64bit',
+    'syscalls.statfs01_64bit',
+    'syscalls.statfs02_32bit',
+    'syscalls.statfs02_64_32bit',
+    'syscalls.statfs02_64_64bit',
+    'syscalls.statfs02_64bit',
+    'syscalls.statfs03_32bit',
+    'syscalls.statfs03_64_32bit',
+    'syscalls.statfs03_64_64bit',
+    'syscalls.statfs03_64bit',
+    'syscalls.statvfs01_32bit',
+    'syscalls.statvfs01_64bit',
+    'syscalls.statvfs02_32bit',
+    'syscalls.statvfs02_64bit',
+    'syscalls.string01_32bit',
+    'syscalls.string01_64bit',
+    'syscalls.swapoff01_32bit',
+    'syscalls.swapoff01_64bit',
+    'syscalls.swapoff02_32bit',
+    'syscalls.swapoff02_64bit',
+    'syscalls.swapon01_32bit',
+    'syscalls.swapon01_64bit',
+    'syscalls.swapon02_32bit',
+    'syscalls.swapon02_64bit',
+    'syscalls.swapon03_32bit',
+    'syscalls.swapon03_64bit',
+    'syscalls.symlink01_32bit',
+    'syscalls.symlink01_64bit',
+    'syscalls.symlink02_32bit',
+    'syscalls.symlink02_64bit',
+    'syscalls.symlink03_32bit',
+    'syscalls.symlink03_64bit',
+    'syscalls.symlink04_32bit',
+    'syscalls.symlink04_64bit',
+    'syscalls.symlink05_32bit',
+    'syscalls.symlink05_64bit',
+    'syscalls.symlinkat01_32bit',
+    'syscalls.symlinkat01_64bit',
+    'syscalls.sync01_32bit',
+    'syscalls.sync01_64bit',
+    'syscalls.sync02_32bit',
+    'syscalls.sync02_64bit',
+    'syscalls.sync_file_range01_32bit',
+    'syscalls.sync_file_range01_64bit',
+    'syscalls.syscall01_32bit',
+    'syscalls.syscall01_64bit',
+    'syscalls.sysinfo01_32bit',
+    'syscalls.sysinfo01_64bit',
+    'syscalls.sysinfo02_32bit',
+    'syscalls.sysinfo02_64bit',
+    'syscalls.syslog11_32bit',
+    'syscalls.syslog11_64bit',
+    'syscalls.syslog12_32bit',
+    'syscalls.syslog12_64bit',
+    'syscalls.tee01_32bit',
+    'syscalls.tee01_64bit',
+    'syscalls.tee02_32bit',
+    'syscalls.tee02_64bit',
+    'syscalls.time01_32bit',
+    'syscalls.time01_64bit',
+    'syscalls.time02_32bit',
+    'syscalls.time02_64bit',
+    'syscalls.timer_getoverrun01_32bit',
+    'syscalls.timer_getoverrun01_64bit',
+    'syscalls.timer_gettime01_32bit',
+    'syscalls.timer_gettime01_64bit',
+    'syscalls.timerfd01_32bit',
+    'syscalls.timerfd01_64bit',
+    'syscalls.timerfd02_32bit',
+    'syscalls.timerfd02_64bit',
+    'syscalls.timerfd03_32bit',
+    'syscalls.timerfd03_64bit',
+    'syscalls.timerfd_create01_32bit',
+    'syscalls.timerfd_create01_64bit',
+    'syscalls.timerfd_gettime01_32bit',
+    'syscalls.timerfd_gettime01_64bit',
+    'syscalls.timerfd_settime01_32bit',
+    'syscalls.timerfd_settime01_64bit',
+    'syscalls.times01_32bit',
+    'syscalls.times01_64bit',
+    'syscalls.times03_32bit',
+    'syscalls.times03_64bit',
+    'syscalls.tkill01_32bit',
+    'syscalls.tkill01_64bit',
+    'syscalls.tkill02_32bit',
+    'syscalls.tkill02_64bit',
+    'syscalls.truncate01_32bit',
+    'syscalls.truncate01_64_32bit',
+    'syscalls.truncate01_64_64bit',
+    'syscalls.truncate01_64bit',
+    'syscalls.truncate02_32bit',
+    'syscalls.truncate02_64_32bit',
+    'syscalls.truncate02_64_64bit',
+    'syscalls.truncate02_64bit',
+    'syscalls.truncate03_32bit',
+    'syscalls.truncate03_64_32bit',
+    'syscalls.truncate03_64_64bit',
+    'syscalls.truncate03_64bit',
+    'syscalls.umask01_32bit',
+    'syscalls.umask01_64bit',
+    'syscalls.uname01_32bit',
+    'syscalls.uname01_64bit',
+    'syscalls.uname02_32bit',
+    'syscalls.uname02_64bit',
+    'syscalls.uname03_32bit',
+    'syscalls.uname03_64bit',
+    'syscalls.unlink01_32bit',
+    'syscalls.unlink01_64bit',
+    'syscalls.unlink05_32bit',
+    'syscalls.unlink05_64bit',
+    'syscalls.unlink06_32bit',
+    'syscalls.unlink06_64bit',
+    'syscalls.unlink07_32bit',
+    'syscalls.unlink07_64bit',
+    'syscalls.unlink08_32bit',
+    'syscalls.unlink08_64bit',
+    'syscalls.unlinkat01_32bit',
+    'syscalls.unlinkat01_64bit',
+    'syscalls.unshare01_32bit',
+    'syscalls.unshare01_64bit',
+    'syscalls.unshare02_32bit',
+    'syscalls.unshare02_64bit',
+    'syscalls.utime01A_32bit',
+    'syscalls.utime01A_64bit',
+    'syscalls.utime01_32bit',
+    'syscalls.utime01_64bit',
+    'syscalls.utime02_32bit',
+    'syscalls.utime02_64bit',
+    'syscalls.utime03_32bit',
+    'syscalls.utime03_64bit',
+    'syscalls.utime04_32bit',
+    'syscalls.utime04_64bit',
+    'syscalls.utime05_32bit',
+    'syscalls.utime05_64bit',
+    'syscalls.vfork01_32bit',
+    'syscalls.vfork01_64bit',
+    'syscalls.vmsplice01_32bit',
+    'syscalls.vmsplice01_64bit',
+    'syscalls.vmsplice02_32bit',
+    'syscalls.vmsplice02_64bit',
+    'syscalls.wait01_32bit',
+    'syscalls.wait01_64bit',
+    'syscalls.wait02_32bit',
+    'syscalls.wait02_64bit',
+    'syscalls.wait401_32bit',
+    'syscalls.wait401_64bit',
+    'syscalls.wait402_32bit',
+    'syscalls.wait402_64bit',
+    'syscalls.waitid01_32bit',
+    'syscalls.waitid01_64bit',
+    'syscalls.waitid02_32bit',
+    'syscalls.waitid02_64bit',
+    'syscalls.waitpid01_32bit',
+    'syscalls.waitpid01_64bit',
+    'syscalls.waitpid02_32bit',
+    'syscalls.waitpid03_32bit',
+    'syscalls.waitpid03_64bit',
+    'syscalls.waitpid04_32bit',
+    'syscalls.waitpid04_64bit',
+    'syscalls.waitpid06_32bit',
+    'syscalls.waitpid06_64bit',
+    'syscalls.waitpid07_32bit',
+    'syscalls.waitpid07_64bit',
+    'syscalls.waitpid08_32bit',
+    'syscalls.waitpid08_64bit',
+    'syscalls.waitpid09_32bit',
+    'syscalls.waitpid09_64bit',
+    'syscalls.waitpid10_32bit',
+    'syscalls.waitpid10_64bit',
+    'syscalls.waitpid11_32bit',
+    'syscalls.waitpid11_64bit',
+    'syscalls.waitpid12_32bit',
+    'syscalls.waitpid12_64bit',
+    'syscalls.waitpid13_32bit',
+    'syscalls.waitpid13_64bit',
+    'syscalls.write01_32bit',
+    'syscalls.write01_64bit',
+    'syscalls.write02_32bit',
+    'syscalls.write02_64bit',
+    'syscalls.write03_32bit',
+    'syscalls.write03_64bit',
+    'syscalls.write04_32bit',
+    'syscalls.write04_64bit',
+    'syscalls.write05_32bit',
+    'syscalls.write05_64bit',
+    'syscalls.writev02_32bit',
+    'syscalls.writev02_64bit',
+    'syscalls.writev05_32bit',
+    'syscalls.writev05_64bit',
+    'syscalls.writev06_32bit',
+    'syscalls.writev06_64bit',
+    'timers.clock_gettime02_32bit',
+    'timers.clock_gettime02_64bit',
+    'timers.clock_gettime03_32bit',
+    'timers.clock_gettime03_64bit',
+    'timers.clock_settime02_32bit',
+    'timers.clock_settime02_64bit',
+    'timers.clock_settime03_32bit',
+    'timers.clock_settime03_64bit',
+    'timers.leapsec_timer_32bit',
+    'timers.leapsec_timer_64bit',
+    'timers.timer_create02_32bit',
+    'timers.timer_create02_64bit',
+    'timers.timer_create03_32bit',
+    'timers.timer_create03_64bit',
+    'timers.timer_create04_32bit',
+    'timers.timer_create04_64bit',
+    'timers.timer_delete02_32bit',
+    'timers.timer_delete02_64bit',
+    'timers.timer_delete03_32bit',
+    'timers.timer_delete03_64bit',
+    'timers.timer_settime02_32bit',
+    'timers.timer_settime02_64bit',
+    'timers.timer_settime03_32bit',
+    'timers.timer_settime03_64bit',
+    'tracing.ftrace-stress-test_32bit',
+    'tracing.ftrace-stress-test_64bit',
+    'tracing.ftrace_regression02_32bit',
+    'tracing.ftrace_regression02_64bit',
+]
diff --git a/ltp/ltp_configs.py b/ltp/ltp_configs.py
index 38b595f..2684157 100644
--- a/ltp/ltp_configs.py
+++ b/ltp/ltp_configs.py
@@ -22,7 +22,8 @@
 
 VTS_LTP_OUTPUT = os.path.join('DATA', 'nativetest', 'ltp')
 LTP_RUNTEST_DIR = os.path.join(VTS_LTP_OUTPUT, 'runtest')
-LTP_DISABLED_BUILD_TESTS_CONFIG_PATH = os.path.join(VTS_LTP_OUTPUT, 'disabled_tests.txt')
+LTP_DISABLED_BUILD_TESTS_CONFIG_PATH = os.path.join(VTS_LTP_OUTPUT,
+                                                    'disabled_tests.txt')
 
 # Environment paths for ltp test cases
 # string, ltp build root directory on target
@@ -229,791 +230,3 @@
     'securebits',
     'tracing',
 ]
-
-# Staging tests are for debugging and verifying fixed tests
-# Test specified here can be in format: testsuite.testname,
-# or testsuite.testname_**bit, or just testname. Using just testname
-# is not recommended
-STAGING_TESTS = [
-    # Recently fixed, validating in staging
-    'syscalls.creat08',
-    'syscalls.open10',
-    # flakey due to b/62575538
-    'syscalls.epoll_ctl01_32bit',
-    'syscalls.epoll_ctl01_64bit',
-    'syscalls.epoll_wait01_32bit',
-    'syscalls.epoll_wait01_64bit',
-    # b/38393835 failing for kernel 4.4, 4.9
-    'syscalls.writev01',
-    'syscalls.writev03',
-    'syscalls.writev04',
-    # b/37861231
-    'modules.delete_module02',
-    # Flaky on pixel
-    # b/32417988
-    'syscalls.waitpid02_64bit',
-    # Tests currently only failing on pixels,
-    # these will be inspected soon
-    'syscalls.open14',
-    'syscalls.openat03',
-    # Fail on local device but pass on lab devices
-    'fs.proc01',
-    # Failing for missing libcap
-    'containers.userns01_64bit',
-    'securebits.check_keepcaps03_64bit',
-    'securebits.check_keepcaps02_64bit',
-    'containers.userns05_64bit',
-    'containers.userns07_64bit',
-    'containers.userns06_64bit',
-    'containers.userns03_64bit',
-    'securebits.check_keepcaps01_64bit',
-    'containers.userns02_64bit',
-
-    # Skipped tests on pixels are put in staging
-    'admin_tools.acl_test01_32bit',
-    'admin_tools.acl_test01_64bit',
-    'admin_tools.at_allow01_32bit',
-    'admin_tools.at_allow01_64bit',
-    'admin_tools.at_deny01_32bit',
-    'admin_tools.at_deny01_64bit',
-    'can.can_filter_32bit',
-    'can.can_filter_64bit',
-    'can.can_rcv_own_msgs_32bit',
-    'can.can_rcv_own_msgs_64bit',
-    'commands.df01_exfat_32bit',
-    'commands.df01_exfat_64bit',
-    'commands.df01_ext2_32bit',
-    'commands.df01_ext2_64bit',
-    'commands.df01_ext3_32bit',
-    'commands.df01_ext3_64bit',
-    'commands.df01_ext4_32bit',
-    'commands.df01_ext4_64bit',
-    'commands.df01_ntfs_32bit',
-    'commands.df01_ntfs_64bit',
-    'commands.df01_vfat_32bit',
-    'commands.df01_vfat_64bit',
-    'commands.df01_xfs_32bit',
-    'commands.df01_xfs_64bit',
-    'commands.insmod01_32bit',
-    'commands.insmod01_64bit',
-    'commands.mkfs01_btrfs_32bit',
-    'commands.mkfs01_btrfs_64bit',
-    'commands.mkfs01_ext2_32bit',
-    'commands.mkfs01_ext2_64bit',
-    'commands.mkfs01_ext3_32bit',
-    'commands.mkfs01_ext3_64bit',
-    'commands.mkfs01_ext4_32bit',
-    'commands.mkfs01_ext4_64bit',
-    'commands.mkfs01_minix_32bit',
-    'commands.mkfs01_minix_64bit',
-    'commands.mkfs01_msdos_32bit',
-    'commands.mkfs01_msdos_64bit',
-    'commands.mkfs01_ntfs_32bit',
-    'commands.mkfs01_ntfs_64bit',
-    'commands.mkfs01_vfat_32bit',
-    'commands.mkfs01_vfat_64bit',
-    'commands.mkfs01_xfs_32bit',
-    'commands.mkfs01_xfs_64bit',
-    'commands.mkswap01_32bit',
-    'commands.mkswap01_64bit',
-    'connectors.Connectors_32bit',
-    'connectors.Connectors_64bit',
-    'containers.pidns01_32bit',
-    'containers.pidns01_64bit',
-    'containers.pidns02_32bit',
-    'containers.pidns02_64bit',
-    'containers.pidns03_32bit',
-    'containers.pidns03_64bit',
-    'containers.pidns04_32bit',
-    'containers.pidns04_64bit',
-    'containers.pidns05_32bit',
-    'containers.pidns05_64bit',
-    'containers.pidns06_32bit',
-    'containers.pidns06_64bit',
-    'containers.pidns13_32bit',
-    'containers.pidns13_64bit',
-    'containers.pidns16_32bit',
-    'containers.pidns16_64bit',
-    'containers.pidns32_32bit',
-    'containers.pidns32_64bit',
-    'containers.userns01_32bit',
-    'containers.userns02_32bit',
-    'containers.userns03_32bit',
-    'containers.userns04_32bit',
-    'containers.userns04_64bit',
-    'containers.userns05_32bit',
-    'containers.userns06_32bit',
-    'containers.userns07_32bit',
-    'containers.utstest_clone_1_32bit',
-    'containers.utstest_clone_1_64bit',
-    'containers.utstest_clone_2_32bit',
-    'containers.utstest_clone_2_64bit',
-    'containers.utstest_clone_3_32bit',
-    'containers.utstest_clone_3_64bit',
-    'containers.utstest_clone_4_32bit',
-    'containers.utstest_clone_4_64bit',
-    'containers.utstest_clone_5_32bit',
-    'containers.utstest_clone_5_64bit',
-    'containers.utstest_unshare_1_32bit',
-    'containers.utstest_unshare_1_64bit',
-    'containers.utstest_unshare_2_32bit',
-    'containers.utstest_unshare_2_64bit',
-    'containers.utstest_unshare_3_32bit',
-    'containers.utstest_unshare_3_64bit',
-    'containers.utstest_unshare_4_32bit',
-    'containers.utstest_unshare_4_64bit',
-    'containers.utstest_unshare_5_32bit',
-    'containers.utstest_unshare_5_64bit',
-    'cpuhotplug.cpuhotplug05_32bit',
-    'cpuhotplug.cpuhotplug05_64bit',
-    'cpuhotplug.cpuhotplug07_32bit',
-    'cpuhotplug.cpuhotplug07_64bit',
-    'fs_ext4.ext4-nsec-timestamps_32bit',
-    'fs_ext4.ext4-nsec-timestamps_64bit',
-    'fs_ext4.ext4-subdir-limit_32bit',
-    'fs_ext4.ext4-subdir-limit_64bit',
-    'hugetlb.hugemmap01_32bit',
-    'hugetlb.hugemmap01_64bit',
-    'hugetlb.hugemmap02_32bit',
-    'hugetlb.hugemmap02_64bit',
-    'hugetlb.hugemmap04_32bit',
-    'hugetlb.hugemmap04_64bit',
-    'hugetlb.hugemmap06_32bit',
-    'hugetlb.hugemmap06_64bit',
-    'hyperthreading.ht_interrupt_32bit',
-    'hyperthreading.ht_interrupt_64bit',
-    'kernel_misc.block_dev_32bit',
-    'kernel_misc.block_dev_64bit',
-    'kernel_misc.cpufreq_boost_32bit',
-    'kernel_misc.cpufreq_boost_64bit',
-    'kernel_misc.fw_load_32bit',
-    'kernel_misc.fw_load_64bit',
-    'kernel_misc.lock_torture_32bit',
-    'kernel_misc.lock_torture_64bit',
-    'kernel_misc.ltp_acpi_32bit',
-    'kernel_misc.ltp_acpi_64bit',
-    'kernel_misc.rcu_torture_32bit',
-    'kernel_misc.rcu_torture_64bit',
-    'kernel_misc.rtc01_32bit',
-    'kernel_misc.rtc01_64bit',
-    'kernel_misc.tbio_32bit',
-    'kernel_misc.tbio_64bit',
-    'kernel_misc.tpci_32bit',
-    'kernel_misc.tpci_64bit',
-    'kernel_misc.uaccess_32bit',
-    'kernel_misc.uaccess_64bit',
-    'kernel_misc.zram01_32bit',
-    'kernel_misc.zram01_64bit',
-    'kernel_misc.zram02_32bit',
-    'kernel_misc.zram02_64bit',
-    'mm.ksm01_1_32bit',
-    'mm.ksm01_1_64bit',
-    'mm.ksm01_32bit',
-    'mm.ksm01_64bit',
-    'mm.ksm02_1_32bit',
-    'mm.ksm02_1_64bit',
-    'mm.ksm02_32bit',
-    'mm.ksm02_64bit',
-    'mm.ksm03_1_32bit',
-    'mm.ksm03_1_64bit',
-    'mm.ksm03_32bit',
-    'mm.ksm03_64bit',
-    'mm.ksm04_1_32bit',
-    'mm.ksm04_1_64bit',
-    'mm.ksm04_32bit',
-    'mm.ksm04_64bit',
-    'mm.ksm06_1_32bit',
-    'mm.ksm06_1_64bit',
-    'mm.ksm06_2_32bit',
-    'mm.ksm06_2_64bit',
-    'mm.ksm06_32bit',
-    'mm.ksm06_64bit',
-    'mm.mmap10_2_32bit',
-    'mm.mmap10_2_64bit',
-    'mm.mmap10_3_32bit',
-    'mm.mmap10_3_64bit',
-    'mm.mmap10_4_32bit',
-    'mm.mmap10_4_64bit',
-    'mm.mmapstress08_32bit',
-    'mm.mmapstress08_64bit',
-    'mm.oom01_32bit',
-    'mm.oom02_32bit',
-    'mm.oom03_32bit',
-    'mm.oom04_32bit',
-    'mm.oom05_32bit',
-    'mm.overcommit_memory01_32bit',
-    'mm.overcommit_memory02_32bit',
-    'mm.overcommit_memory03_32bit',
-    'mm.overcommit_memory04_32bit',
-    'mm.overcommit_memory05_32bit',
-    'mm.overcommit_memory06_32bit',
-    'mm.swapping01_32bit',
-    'mm.thp02_32bit',
-    'mm.thp03_32bit',
-    'mm.vma02_32bit',
-    'mm.vma02_64bit',
-    'mm.vma04_32bit',
-    'mm.vma04_64bit',
-    'modules.delete_module01_32bit',
-    'modules.delete_module01_64bit',
-    'modules.delete_module03_32bit',
-    'modules.delete_module03_64bit',
-    'numa.move_pages01_32bit',
-    'numa.move_pages01_64bit',
-    'numa.move_pages02_32bit',
-    'numa.move_pages02_64bit',
-    'numa.move_pages04_32bit',
-    'numa.move_pages04_64bit',
-    'numa.move_pages05_32bit',
-    'numa.move_pages05_64bit',
-    'numa.move_pages06_32bit',
-    'numa.move_pages06_64bit',
-    'numa.move_pages07_32bit',
-    'numa.move_pages07_64bit',
-    'numa.move_pages08_32bit',
-    'numa.move_pages08_64bit',
-    'numa.move_pages09_32bit',
-    'numa.move_pages09_64bit',
-    'numa.move_pages10_32bit',
-    'numa.move_pages10_64bit',
-    'power_management_tests.runpwtests01_32bit',
-    'power_management_tests.runpwtests01_64bit',
-    'power_management_tests.runpwtests02_32bit',
-    'power_management_tests.runpwtests02_64bit',
-    'power_management_tests.runpwtests03_32bit',
-    'power_management_tests.runpwtests03_64bit',
-    'power_management_tests.runpwtests04_32bit',
-    'power_management_tests.runpwtests04_64bit',
-    'power_management_tests.runpwtests06_32bit',
-    'power_management_tests.runpwtests06_64bit',
-    'syscalls.acct01_32bit',
-    'syscalls.acct01_64bit',
-    'syscalls.cacheflush01_32bit',
-    'syscalls.cacheflush01_64bit',
-    'syscalls.fanotify01_32bit',
-    'syscalls.fanotify01_64bit',
-    'syscalls.fanotify02_32bit',
-    'syscalls.fanotify02_64bit',
-    'syscalls.fanotify03_32bit',
-    'syscalls.fanotify03_64bit',
-    'syscalls.fanotify04_32bit',
-    'syscalls.fanotify04_64bit',
-    'syscalls.fanotify05_32bit',
-    'syscalls.fanotify05_64bit',
-    'syscalls.fanotify06_32bit',
-    'syscalls.fanotify06_64bit',
-    'syscalls.fcntl06_32bit',
-    'syscalls.fcntl06_64_32bit',
-    'syscalls.fcntl06_64_64bit',
-    'syscalls.fcntl06_64bit',
-    'syscalls.fork14_32bit',
-    'syscalls.fork14_64bit',
-    'syscalls.futex_wake04_32bit',
-    'syscalls.futex_wake04_64bit',
-    'syscalls.get_mempolicy01_32bit',
-    'syscalls.get_mempolicy01_64bit',
-    'syscalls.getcpu01_32bit',
-    'syscalls.getcpu01_64bit',
-    'syscalls.getxattr01_32bit',
-    'syscalls.getxattr01_64bit',
-    'syscalls.getxattr02_32bit',
-    'syscalls.getxattr02_64bit',
-    'syscalls.getxattr03_32bit',
-    'syscalls.getxattr03_64bit',
-    'syscalls.kcmp01_32bit',
-    'syscalls.kcmp01_64bit',
-    'syscalls.kcmp02_32bit',
-    'syscalls.kcmp02_64bit',
-    'syscalls.keyctl01_32bit',
-    'syscalls.keyctl01_64bit',
-    'syscalls.mbind01_32bit',
-    'syscalls.mbind01_64bit',
-    'syscalls.migrate_pages01_32bit',
-    'syscalls.migrate_pages01_64bit',
-    'syscalls.migrate_pages02_32bit',
-    'syscalls.migrate_pages02_64bit',
-    'syscalls.mmap15_32bit',
-    'syscalls.mmap15_64bit',
-    'syscalls.move_pages01_32bit',
-    'syscalls.move_pages01_64bit',
-    'syscalls.move_pages02_32bit',
-    'syscalls.move_pages02_64bit',
-    'syscalls.move_pages04_32bit',
-    'syscalls.move_pages04_64bit',
-    'syscalls.move_pages05_32bit',
-    'syscalls.move_pages05_64bit',
-    'syscalls.move_pages06_32bit',
-    'syscalls.move_pages06_64bit',
-    'syscalls.move_pages07_32bit',
-    'syscalls.move_pages07_64bit',
-    'syscalls.move_pages08_32bit',
-    'syscalls.move_pages08_64bit',
-    'syscalls.move_pages09_32bit',
-    'syscalls.move_pages09_64bit',
-    'syscalls.move_pages10_32bit',
-    'syscalls.move_pages10_64bit',
-    'syscalls.munlockall02_32bit',
-    'syscalls.munlockall02_64bit',
-    'syscalls.ptrace04_32bit',
-    'syscalls.ptrace04_64bit',
-    'syscalls.quotactl02_32bit',
-    'syscalls.quotactl02_64bit',
-    'syscalls.readdir21_32bit',
-    'syscalls.readdir21_64bit',
-    'syscalls.removexattr01_32bit',
-    'syscalls.removexattr01_64bit',
-    'syscalls.removexattr02_32bit',
-    'syscalls.removexattr02_64bit',
-    'syscalls.sendfile09_32bit',
-    'syscalls.sendfile09_64_32bit',
-    'syscalls.sendfile09_64_64bit',
-    'syscalls.sendfile09_64bit',
-    'syscalls.setxattr01_32bit',
-    'syscalls.setxattr01_64bit',
-    'syscalls.setxattr02_32bit',
-    'syscalls.setxattr02_64bit',
-    'syscalls.setxattr03_32bit',
-    'syscalls.setxattr03_64bit',
-    'syscalls.sgetmask01_32bit',
-    'syscalls.sgetmask01_64bit',
-    'syscalls.signal06_32bit',
-    'syscalls.signal06_64bit',
-    'syscalls.sockioctl01_32bit',
-    'syscalls.sockioctl01_64bit',
-    'syscalls.ssetmask01_32bit',
-    'syscalls.ssetmask01_64bit',
-    'syscalls.switch01_32bit',
-    'syscalls.switch01_64bit',
-    'syscalls.sysctl01_32bit',
-    'syscalls.sysctl01_64bit',
-    'syscalls.sysctl03_32bit',
-    'syscalls.sysctl03_64bit',
-    'syscalls.sysctl04_32bit',
-    'syscalls.sysctl04_64bit',
-    'syscalls.sysctl05_32bit',
-    'syscalls.sysctl05_64bit',
-    'syscalls.sysfs01_32bit',
-    'syscalls.sysfs01_64bit',
-    'syscalls.sysfs02_32bit',
-    'syscalls.sysfs02_64bit',
-    'syscalls.sysfs03_32bit',
-    'syscalls.sysfs03_64bit',
-    'syscalls.sysfs04_32bit',
-    'syscalls.sysfs04_64bit',
-    'syscalls.sysfs05_32bit',
-    'syscalls.sysfs05_64bit',
-    'syscalls.sysfs06_32bit',
-    'syscalls.sysfs06_64bit',
-    'tracing.ftrace_regression01_32bit',
-    'tracing.ftrace_regression01_64bit',
-]
-
-# Tests disabled
-# Based on external/ltp commit 5f01077afe994f4107b147222f3956716d4a8fde
-DISABLED_TESTS = [
-    # b/63928505
-    'syscalls.add_key02',
-    # gunzip newly added on 4/12/17 and test is failing because -r option is not yet implemented.
-    'commands.gzip01',
-    # b/32386191 getrusage04 result is flaky
-    'syscalls.getrusage04',
-    # b/31154962
-    'cpuhotplug.cpuhotplug02',
-    # The following test cases are uncategorized
-    'syscalls.fcntl34',
-    'syscalls.fcntl34_64',
-    'syscalls.inotify06',
-    'syscalls.abort01',
-    'syscalls.chmod05',
-    'syscalls.chmod07',
-    'syscalls.chown01_16',
-    'syscalls.chown02_16',
-    'syscalls.chown03_16',
-    'syscalls.chown05_16',
-    'syscalls.fchmod01',
-    'syscalls.fchmod02',
-    'syscalls.fchmod05',
-    'syscalls.fchmod06',
-    'syscalls.fchown01_16',
-    'syscalls.fchown02_16',
-    'syscalls.fchown03_16',
-    'syscalls.fchown04_16',
-    'syscalls.fchown05_16',
-    'syscalls.fsync01',
-    'syscalls.ftruncate04',
-    'syscalls.ftruncate04_64',
-    'syscalls.getcwd02',
-    'syscalls.getcwd03',
-    'syscalls.getegid01_16',
-    'syscalls.getegid02_16',
-    'syscalls.geteuid01_16',
-    'syscalls.geteuid02_16',
-    'syscalls.getgid01_16',
-    'syscalls.getgid03_16',
-    'syscalls.getgroups01_16',
-    'syscalls.gethostbyname_r01',
-    'syscalls.getuid01_16',
-    'syscalls.getuid03_16',
-    'syscalls.ioctl03',
-    'syscalls.inotify03',
-    'syscalls.kill11',
-    'syscalls.lchown01_16',
-    'syscalls.lchown02_16',
-    'syscalls.lchown03_16',
-    'syscalls.link08',
-    'syscalls.linkat02',
-    'syscalls.mkdir03',
-    'syscalls.rmdir02',
-    'syscalls.mkdirat02',
-    'syscalls.mknod07',
-    'syscalls.mknodat02',
-    'syscalls.mmap16',
-    'syscalls.mount01',
-    'syscalls.mount02',
-    'syscalls.mount03',
-    'syscalls.mount04',
-    'syscalls.mount06',
-    'syscalls.move_pages03',
-    'syscalls.move_pages11',
-    'syscalls.mprotect01',
-    'syscalls.nftw01',
-    'syscalls.nftw6401',
-    'syscalls.nice04',
-    'syscalls.open01',
-    'syscalls.open08',
-    'syscalls.open11',
-    'syscalls.madvise01',
-    'syscalls.madvise02',
-    'syscalls.madvise06',
-    'syscalls.pathconf01',
-    'syscalls.preadv02',
-    'syscalls.process_vm_readv01',
-    'syscalls.process_vm_writev01',
-    'syscalls.pwritev01_64',
-    'syscalls.pwritev02',
-    'syscalls.quotactl01',
-    'syscalls.readlink04',
-    'syscalls.rename11',
-    'syscalls.renameat01',
-    'syscalls.request_key01',
-    'syscalls.request_key02',
-    'syscalls.rt_sigprocmask01',
-    'syscalls.sbrk03',
-    'syscalls.setfsgid01_16',
-    'syscalls.setfsgid02_16',
-    'syscalls.setfsgid03_16',
-    'syscalls.setfsuid01_16',
-    'syscalls.setfsuid02_16',
-    'syscalls.setfsuid03_16',
-    'syscalls.setfsuid04_16',
-    'syscalls.setgid01_16',
-    'syscalls.setgid02_16',
-    'syscalls.setgid03_16',
-    'syscalls.setgroups01_16',
-    'syscalls.setgroups02_16',
-    'syscalls.setgroups03_16',
-    'syscalls.setgroups04_16',
-    'syscalls.setregid01_16',
-    'syscalls.setregid02_16',
-    'syscalls.setregid03_16',
-    'syscalls.setregid04_16',
-    'syscalls.setresgid01_16',
-    'syscalls.setresgid02_16',
-    'syscalls.setresgid03_16',
-    'syscalls.setresgid04_16',
-    'syscalls.setresuid01_16',
-    'syscalls.setresuid02_16',
-    'syscalls.setresuid03_16',
-    'syscalls.setresuid04_16',
-    'syscalls.setresuid05_16',
-    'syscalls.setreuid01_16',
-    'syscalls.setreuid02_16',
-    'syscalls.setreuid03_16',
-    'syscalls.setreuid04_16',
-    'syscalls.setreuid05_16',
-    'syscalls.setreuid06_16',
-    'syscalls.setreuid07_16',
-    'syscalls.setuid01_16',
-    'syscalls.setuid02_16',
-    'syscalls.setuid03_16',
-    'syscalls.setuid04_16',
-    'syscalls.splice02',
-    'syscalls.sysconf01',
-    'syscalls.syslog01',
-    'syscalls.syslog02',
-    'syscalls.syslog03',
-    'syscalls.syslog04',
-    'syscalls.syslog05',
-    'syscalls.syslog06',
-    'syscalls.syslog07',
-    'syscalls.syslog08',
-    'syscalls.syslog09',
-    'syscalls.syslog10',
-    'syscalls.umask02',
-    'syscalls.umask03',
-    'syscalls.umount01',
-    'syscalls.umount02',
-    'syscalls.umount03',
-    'syscalls.umount2_01',
-    'syscalls.umount2_02',
-    'syscalls.umount2_03',
-    'syscalls.utime06',
-    'syscalls.utimes01',
-    'syscalls.utimensat01',
-    'syscalls.waitpid05',
-    'fs.gf01',
-    'fs.gf02',
-    'fs.gf03',
-    'fs.gf04',
-    'fs.gf05',
-    'fs.gf06',
-    'fs.gf07',
-    'fs.gf08',
-    'fs.gf09',
-    'fs.gf10',
-    'fs.gf11',
-    'fs.gf14',
-    'fs.gf15',
-    'fs.gf16',
-    'fs.gf17',
-    'fs.gf18',
-    'fs.gf19',
-    'fs.gf20',
-    'fs.gf21',
-    'fs.gf22',
-    'fs.gf23',
-    'fs.gf24',
-    'fs.gf25',
-    'fs.gf26',
-    'fs.gf27',
-    'fs.gf28',
-    'fs.gf29',
-    'fs.gf30',
-    'fs.rwtest01',
-    'fs.rwtest02',
-    'fs.rwtest03',
-    'fs.rwtest04',
-    'fs.rwtest05',
-    'fs.iogen01',
-    'fs.fs_inod01',
-    'fs.ftest06',
-    'fs.isofs',
-    'fsx.fsx-linux',
-    'io.aio01',
-    'io.aio02',
-    'mm.mtest06',
-    'mm.shm_test01',
-    'mm.mallocstress01',
-    'mm.mmapstress04',
-    'mm.mmapstress07',
-    'mm.vma03',
-    'mm.min_free_kbytes',
-    'pipes.pipeio_1',
-    'pipes.pipeio_3',
-    'pipes.pipeio_4',
-    'pipes.pipeio_5',
-    'pipes.pipeio_6',
-    'pipes.pipeio_8',
-    'sched.trace_sched01',
-    'math.float_bessel',
-    'math.float_exp_log',
-    'math.float_iperb',
-    'math.float_power',
-    'math.float_trigo',
-    'pty.pty01',
-    'containers.mqns_01_clone',
-    'containers.mqns_02_clone',
-    'containers.mqns_03_clone',
-    'containers.mqns_04_clone',
-    'containers.netns_netlink',
-    'containers.netns_breakns_ns_exec_ipv4_netlink',
-    'containers.netns_breakns_ns_exec_ipv6_netlink',
-    'containers.netns_breakns_ns_exec_ipv4_ioctl',
-    'containers.netns_breakns_ns_exec_ipv6_ioctl',
-    'containers.netns_breakns_ip_ipv4_netlink',
-    'containers.netns_breakns_ip_ipv6_netlink',
-    'containers.netns_breakns_ip_ipv4_ioctl',
-    'containers.netns_breakns_ip_ipv6_ioctl',
-    'containers.netns_comm_ns_exec_ipv4_netlink',
-    'containers.netns_comm_ns_exec_ipv6_netlink',
-    'containers.netns_comm_ns_exec_ipv4_ioctl',
-    'containers.netns_comm_ns_exec_ipv6_ioctl',
-    'containers.netns_comm_ip_ipv4_netlink',
-    'containers.netns_comm_ip_ipv6_netlink',
-    'containers.netns_comm_ip_ipv4_ioctl',
-    'containers.netns_comm_ip_ipv6_ioctl',
-    'containers.netns_sysfs',
-    'containers.shmnstest_none',
-    'containers.shmnstest_clone',
-    'containers.shmnstest_unshare',
-    'containers.shmem_2nstest_none',
-    'containers.shmem_2nstest_clone',
-    'containers.shmem_2nstest_unshare',
-    'containers.mesgq_nstest_none',
-    'containers.mesgq_nstest_clone',
-    'containers.mesgq_nstest_unshare',
-    'containers.sem_nstest_none',
-    'containers.sem_nstest_clone',
-    'containers.sem_nstest_unshare',
-    'containers.semtest_2ns_none',
-    'containers.semtest_2ns_clone',
-    'containers.semtest_2ns_unshare',
-    'fs_bind.BindMounts',
-    'filecaps.Filecaps',
-    'cap_bounds.Cap_bounds',
-    'fcntl-locktests_android.FCNTL_LOCKTESTS',
-    'admin_tools.su01',
-    'admin_tools.cron02',
-    'admin_tools.cron_deny01',
-    'admin_tools.cron_allow01',
-    'admin_tools.cron_dirs_checks01',
-    'numa.move_pages03',
-    'numa.move_pages11',
-    'hugetlb.hugemmap05_1',
-    'hugetlb.hugemmap05_2',
-    'hugetlb.hugemmap05_3',
-    'commands.ar',
-    'commands.ld',
-    'commands.nm',
-    'commands.objdump',
-    'commands.file',
-    'commands.tar',
-    'commands.cron',
-    'commands.logrotate',
-    'commands.mail',
-    'commands.cpio',
-    'commands.unzip01',
-    'commands.cp_tests01',
-    'commands.ln_tests01',
-    'commands.mkdir_tests01',
-    'commands.mv_tests01',
-    'commands.size01',
-    'commands.sssd01',
-    'commands.sssd02',
-    'commands.sssd03',
-    'commands.du01',
-    'commands.mkfs01',
-    'commands.lsmod01',
-    'commands.wc01',
-    'hyperthreading.smt_smp_enabled',
-    'hyperthreading.smt_smp_affinity',
-    'kernel_misc.zram03',
-    'fs_ext4.ext4-uninit-groups',
-    'fs_ext4.ext4-persist-prealloc',
-    'cpuhotplug.cpuhotplug03',
-    'cpuhotplug.cpuhotplug06',
-    'input.input06',
-    'dio.dio10',
-    'fsx.fsx-linux',
-    'dio.dio04',
-    'numa.Numa-testcases',
-    'syscalls.connect01',
-    'syscalls.prot_hsymlinks',
-    'fs.ftest01',
-    'fs.ftest03',
-    'fs.ftest04',
-    'fs.ftest05',
-    'fs.ftest07',
-    'fs.ftest08',
-    'fs.inode02',
-    'ipc.signal_test_01',
-    'mm.data_space',
-    'mm.mmapstress01',
-    'mm.mmapstress03',
-    'mm.mmapstress09',
-    'mm.mmapstress10',
-    'syscalls.clock_nanosleep01',
-    'syscalls.clone04',
-    'syscalls.fcntl14',
-    'syscalls.fcntl14',
-    'syscalls.fcntl14_64',
-    'syscalls.fcntl17',
-    'syscalls.fcntl17_64',
-    'syscalls.getdomainname01',
-    'syscalls.kill12',
-    'syscalls.setdomainname01',
-    'syscalls.setdomainname02',
-    'syscalls.setdomainname03',
-    'syscalls.sighold02',
-    'syscalls.sigpending02',
-    'syscalls.sigrelse01',
-    'syscalls.vfork02',
-    # The following tests are not stable on 64bit version
-    'input.input01_64bit',
-    'input.input02_64bit',
-    'input.input03_64bit',
-    'input.input04_64bit',
-    'input.input05_64bit',
-    'input.input06_64bit',
-    # The following tests are failing on 64bit version
-    'mm.overcommit_memory01_64bit',
-    'mm.overcommit_memory02_64bit',
-    'mm.overcommit_memory03_64bit',
-    'mm.overcommit_memory04_64bit',
-    'mm.overcommit_memory05_64bit',
-    'mm.overcommit_memory06_64bit',
-    # 'which' in Android does not accept the tested options b/31152668
-    'commands.which01',
-    # tests that are currently killing some lab devices 64bit on (pixel and bullhead)
-    # b/31181781
-    'mm.oom01_64bit',
-    'mm.oom02_64bit',
-    'mm.oom03_64bit',
-    'mm.oom04_64bit',
-    'mm.oom05_64bit',
-    'mm.swapping01_64bit',
-    'mm.thp01_64bit',
-    'mm.thp02_64bit',
-    'mm.thp03_64bit',
-    'mm.vma01_64bit',
-    # b/65636203
-    'mm.thp01_32bit',
-    # kmsg01 would pass but it occasionally causes socket timeout and misalignment
-    # of request and response
-    # b/32343072
-    'kernel_misc.kmsg01',
-    # alarm02 tests for a boundary condition which is impractical to implement
-    # correctly on 32-bit Linux.  bionic deliberately breaks with POSIX by reporting
-    # that it failed to set up the alarm.  (Other libc implementations fail to
-    # set up the alarm too, but then return 0 anyway.)
-    'syscalls.alarm02',
-    # readdir02 calls opendir() -> closedir() -> readdir() and checks if readdir()
-    # returns EBADF.  POSIX doesn't require this, and bionic is likely to instead
-    # deadlock trying to acquire a destroyed mutex.
-    'syscalls.readdir02',
-    # Android sets RLIMIT_NICE to 40, so setpriority02 succeeds unexpectedly
-    'syscalls.setpriority02',
-    # fork13 takes ~45 minutes to run
-    'syscalls.fork13',
-    # open13 tests that fchmod() fails on fds opened with O_PATH.  bionic
-    # deliberately masks the EBADF returned by the kernel.
-    #
-    # https://android-review.googlesource.com/#/c/127908/
-    'syscalls.open13',
-    # Bug#30675453
-    'syscalls.perf_event_open02',
-    # Bug#30688551
-    'syscalls.lstat03_64',
-    'syscalls.lstat03',
-    # Bug#30688061
-    'input.input03',
-    # Bug#30688056
-    'cpuhotplug.cpuhotplug04',
-    # Bug#30699880
-    'mm.mtest01w',
-    'mm.mtest01',
-    # Bug#30688574
-    'syscalls.accept4_01',
-    # Bug#30689411
-    'mm.mmapstress03',
-    # Bug #32100169
-    'dma_thread_diotest.dma_thread_diotest1',
-    'dma_thread_diotest.dma_thread_diotest2',
-    'dma_thread_diotest.dma_thread_diotest3',
-    'dma_thread_diotest.dma_thread_diotest4',
-    'dma_thread_diotest.dma_thread_diotest5',
-    'dma_thread_diotest.dma_thread_diotest6',
-    'dma_thread_diotest.dma_thread_diotest7',
-    # b/33008689 (closed) requires mkfs.ext4 and loop device support.
-    'fs.quota_remount_test01',
-]
diff --git a/ltp/stable/Android.mk b/ltp/stable/Android.mk
index 28d799b..1807499 100644
--- a/ltp/stable/Android.mk
+++ b/ltp/stable/Android.mk
@@ -20,4 +20,4 @@
 
 LOCAL_MODULE := VtsKernelLtp
 VTS_CONFIG_SRC_DIR := testcases/kernel/ltp/stable
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/ltp/staging/Android.mk b/ltp/staging/Android.mk
index d510c3b..5161053 100644
--- a/ltp/staging/Android.mk
+++ b/ltp/staging/Android.mk
@@ -20,4 +20,4 @@
 
 LOCAL_MODULE := VtsKernelLtpStaging
 VTS_CONFIG_SRC_DIR := testcases/kernel/ltp/staging
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/ltp/test_cases_parser.py b/ltp/test_cases_parser.py
index 7a2d91a..d9eb4a4 100644
--- a/ltp/test_cases_parser.py
+++ b/ltp/test_cases_parser.py
@@ -19,10 +19,12 @@
 import itertools
 
 from vts.runners.host import const
-
 from vts.testcases.kernel.ltp import ltp_configs
 from vts.testcases.kernel.ltp import ltp_enums
 from vts.testcases.kernel.ltp import test_case
+from vts.testcases.kernel.ltp.configs import stable_tests
+from vts.testcases.kernel.ltp.configs import disabled_tests
+from vts.utils.python.common import filter_utils
 
 
 class TestCasesParser(object):
@@ -31,15 +33,16 @@
     Attributes:
         _data_path: string, the vts data path on host side
         _filter_func: function, a filter method that will emit exception if a test is filtered
-        disabled_tests: list of string
-        staging_tests: list of string
+        _ltp_tests_filter: list of string, filter for tests that are stable and disabled
     """
 
-    def __init__(self, data_path, filter_func, disabled_tests, staging_tests):
+    def __init__(self, data_path, filter_func):
         self._data_path = data_path
         self._filter_func = filter_func
-        self._disabled_tests = disabled_tests
-        self._staging_tests = staging_tests
+        self._ltp_tests_filter = filter_utils.Filter(
+            stable_tests.STABLE_TESTS,
+            disabled_tests.DISABLED_TESTS,
+            enable_regex=True)
 
     def ValidateDefinition(self, line):
         """Validate a tab delimited test case definition.
@@ -65,7 +68,7 @@
     def Load(self,
              ltp_dir,
              n_bit,
-             include_filter,
+             test_filter,
              run_staging=False,
              is_low_mem=False):
         """Read the definition file and yields a TestCase generator.
@@ -73,7 +76,7 @@
         Args:
             ltp_dir: string, directory that contains ltp binaries and scripts
             n_bit: int, bitness
-            include_filter: list of string, tests to be scheduled exclusively
+            test_filter: Filter object, test name filter from base_test
             run_staging: bool, whether to use staging configuration
             is_low_mem: bool, whether to use low memory device configuration
         """
@@ -119,15 +122,16 @@
                 testcase.note = "filtered"
 
             # For skipping tests that are not designed or ready for Android
-            if (test_display_name in self._disabled_tests and
-                    test_display_name not in include_filter):
+            if (self._ltp_tests_filter.IsInExcludeFilter(test_display_name) and
+                    not test_filter.IsInIncludeFilter(test_display_name)):
                 logging.info("[Parser] Skipping test case %s. Reason: "
                              "disabled" % testcase.fullname)
                 continue
 
             # For separating staging tests from stable tests
-            if test_display_name in self._staging_tests:
-                if not run_staging and test_display_name not in include_filter:
+            if not self._ltp_tests_filter.IsInIncludeFilter(test_display_name):
+                if not run_staging and not test_filter.IsInIncludeFilter(
+                        test_display_name):
                     # Skip staging tests in stable run
                     continue
                 else:
diff --git a/memory/Android.mk b/memory/Android.mk
index 3e18d41..0fa172a 100644
--- a/memory/Android.mk
+++ b/memory/Android.mk
@@ -16,10 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := MemorySystemStressTest
 VTS_CONFIG_SRC_DIR := testcases/kernel/memory
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk
diff --git a/syscall/Android.mk b/syscall/Android.mk
index 4daa99d..ff67e04 100644
--- a/syscall/Android.mk
+++ b/syscall/Android.mk
@@ -38,4 +38,4 @@
 LOCAL_MODULE := SyscallExistenceTest
 
 VTS_CONFIG_SRC_DIR := testcases/kernel/syscall
-include test/vts/tools/build/Android.host_config.mk
+-include test/vts/tools/build/Android.host_config.mk