diff --git a/android/Android.bp b/android/Android.bp
index 55acc08..bdf9461 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -504,6 +504,7 @@
     ":ltp_fsopen02",
     ":ltp_fspick01",
     ":ltp_fspick02",
+    ":ltp_fsplough",
     ":ltp_fsstress",
     ":ltp_fstat02",
     ":ltp_fstat02_64",
@@ -708,6 +709,7 @@
     ":ltp_hugemmap30",
     ":ltp_hugemmap31",
     ":ltp_hugemmap32",
+    ":ltp_hugemmap34",
     ":ltp_hugeshmget06",
     ":ltp_icmp_rate_limit01",
     ":ltp_ima_boot_aggregate",
@@ -830,6 +832,7 @@
     ":ltp_landlock05",
     ":ltp_landlock06",
     ":ltp_landlock07",
+    ":ltp_landlock08",
     ":ltp_landlock_exec",
     ":ltp_lchown01",
     ":ltp_lchown01_16",
@@ -848,6 +851,10 @@
     ":ltp_linkat01",
     ":ltp_linkat02",
     ":ltp_listen01",
+    ":ltp_listmount01",
+    ":ltp_listmount02",
+    ":ltp_listmount03",
+    ":ltp_listmount04",
     ":ltp_listxattr01",
     ":ltp_listxattr02",
     ":ltp_listxattr03",
@@ -882,6 +889,7 @@
     ":ltp_madvise09",
     ":ltp_madvise10",
     ":ltp_madvise11",
+    ":ltp_madvise12",
     ":ltp_mallinfo01",
     ":ltp_mallinfo02",
     ":ltp_mallinfo2_01",
@@ -1208,6 +1216,11 @@
     ":ltp_pselect03_64",
     ":ltp_pt_test",
     ":ltp_ptem01",
+    ":ltp_ptem02",
+    ":ltp_ptem03",
+    ":ltp_ptem04",
+    ":ltp_ptem05",
+    ":ltp_ptem06",
     ":ltp_pth_str01",
     ":ltp_pth_str02",
     ":ltp_pth_str03",
@@ -1233,6 +1246,8 @@
     ":ltp_pty04",
     ":ltp_pty06",
     ":ltp_pty07",
+    ":ltp_pty08",
+    ":ltp_pty09",
     ":ltp_pwrite01",
     ":ltp_pwrite01_64",
     ":ltp_pwrite02",
@@ -1322,6 +1337,7 @@
     ":ltp_rt_sigprocmask01",
     ":ltp_rt_sigprocmask02",
     ":ltp_rt_sigqueueinfo01",
+    ":ltp_rt_sigqueueinfo02",
     ":ltp_rt_sigsuspend01",
     ":ltp_rt_sigtimedwait01",
     ":ltp_rt_tgsigqueueinfo01",
@@ -1526,6 +1542,7 @@
     ":ltp_setxattr02",
     ":ltp_setxattr03",
     ":ltp_sgetmask01",
+    ":ltp_shell_c_child",
     ":ltp_shell_test01",
     ":ltp_shell_test02",
     ":ltp_shell_test03",
@@ -1597,6 +1614,14 @@
     ":ltp_statfs02_64",
     ":ltp_statfs03",
     ":ltp_statfs03_64",
+    ":ltp_statmount01",
+    ":ltp_statmount02",
+    ":ltp_statmount03",
+    ":ltp_statmount04",
+    ":ltp_statmount05",
+    ":ltp_statmount06",
+    ":ltp_statmount07",
+    ":ltp_statmount08",
     ":ltp_statvfs01",
     ":ltp_statvfs02",
     ":ltp_statx01",
@@ -1905,7 +1930,6 @@
     ":ltp_testcases_bin_ftp-upload-stress.sh",
     ":ltp_testcases_bin_ftp-upload-stress01-rmt.sh",
     ":ltp_testcases_bin_ftp-upload-stress02-rmt.sh",
-    ":ltp_testcases_bin_ftp01.sh",
     ":ltp_testcases_bin_ftrace_lib.sh",
     ":ltp_testcases_bin_ftrace_regression01.sh",
     ":ltp_testcases_bin_ftrace_regression02.sh",
@@ -2061,6 +2085,7 @@
     ":ltp_testcases_bin_nfs07.sh",
     ":ltp_testcases_bin_nfs08.sh",
     ":ltp_testcases_bin_nfs09.sh",
+    ":ltp_testcases_bin_nfs10.sh",
     ":ltp_testcases_bin_nfs_lib.sh",
     ":ltp_testcases_bin_nfslock01.sh",
     ":ltp_testcases_bin_nfsstat01.sh",
diff --git a/android/include/config.h b/android/include/config.h
index cc1ed93..5b8407a 100644
--- a/android/include/config.h
+++ b/android/include/config.h
@@ -416,6 +416,9 @@
 /* Define to 1 if the system has the type `struct mount_attr'. */
 #define HAVE_STRUCT_MOUNT_ATTR 1
 
+/* Define to 1 if the system has the type `struct mnt_id_req'. */
+#define HAVE_STRUCT_MNT_ID_REQ 1
+
 /* Define to 1 if `aux_head' is a member of `struct perf_event_mmap_page'. */
 #define HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD 1
 
@@ -446,6 +449,9 @@
 /* Define to 1 if the system has the type `struct sockaddr_alg'. */
 #define HAVE_STRUCT_SOCKADDR_ALG 1
 
+/* Define to 1 if the system has the type `struct statmount'. */
+#define HAVE_STRUCT_STATMOUNT 1
+
 /* Define to 1 if the system has the type `struct statx'. */
 #define HAVE_STRUCT_STATX 1
 
diff --git a/gen.bp b/gen.bp
index af5d35d..251c3de 100644
--- a/gen.bp
+++ b/gen.bp
@@ -5691,6 +5691,15 @@
 }
 
 cc_test {
+    name: "ltp_fsplough",
+    stem: "fsplough",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/fs/fsplough/fsplough.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fsstress",
     stem: "fsstress",
     defaults: ["ltp_test_defaults"],
@@ -8118,6 +8127,25 @@
 }
 
 cc_test {
+    name: "ltp_hugemmap34",
+    stem: "hugemmap34",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/mem/hugetlb/hugemmap/hugemmap34.c"],
+    local_include_dirs: [
+        "include/old",
+        "testcases/kernel/include",
+        "testcases/kernel/mem/hugetlb/lib",
+        "testcases/kernel/mem/include",
+    ],
+    static_libs: [
+        "libltp_hugetlb",
+        "libltp_kerntest",
+        "libltp_ltp",
+        "libltp_mem",
+    ],
+}
+
+cc_test {
     name: "ltp_hugeshmget06",
     stem: "hugeshmget06",
     defaults: ["ltp_test_defaults"],
@@ -8364,60 +8392,60 @@
     name: "ltp_input01",
     stem: "input01",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/input/input01.c",
-        "testcases/kernel/input/input_helper.c",
-    ],
+    srcs: ["testcases/kernel/input/input01.c"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_ltp",
+        "libltp_ltpuinput",
+    ],
 }
 
 cc_test {
     name: "ltp_input02",
     stem: "input02",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/input/input02.c",
-        "testcases/kernel/input/input_helper.c",
-    ],
+    srcs: ["testcases/kernel/input/input02.c"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_ltp",
+        "libltp_ltpuinput",
+    ],
 }
 
 cc_test {
     name: "ltp_input04",
     stem: "input04",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/input/input04.c",
-        "testcases/kernel/input/input_helper.c",
-    ],
+    srcs: ["testcases/kernel/input/input04.c"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_ltp",
+        "libltp_ltpuinput",
+    ],
 }
 
 cc_test {
     name: "ltp_input05",
     stem: "input05",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/input/input05.c",
-        "testcases/kernel/input/input_helper.c",
-    ],
+    srcs: ["testcases/kernel/input/input05.c"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_ltp",
+        "libltp_ltpuinput",
+    ],
 }
 
 cc_test {
     name: "ltp_input06",
     stem: "input06",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/input/input06.c",
-        "testcases/kernel/input/input_helper.c",
-    ],
+    srcs: ["testcases/kernel/input/input06.c"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_ltp",
+        "libltp_ltpuinput",
+    ],
 }
 
 cc_test {
@@ -9322,6 +9350,15 @@
 }
 
 cc_test {
+    name: "ltp_landlock08",
+    stem: "landlock08",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/landlock/landlock08.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_landlock_exec",
     stem: "landlock_exec",
     defaults: ["ltp_test_defaults"],
@@ -9515,6 +9552,42 @@
 }
 
 cc_test {
+    name: "ltp_listmount01",
+    stem: "listmount01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/listmount/listmount01.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_listmount02",
+    stem: "listmount02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/listmount/listmount02.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_listmount03",
+    stem: "listmount03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/listmount/listmount03.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_listmount04",
+    stem: "listmount04",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/listmount/listmount04.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_listxattr01",
     stem: "listxattr01",
     defaults: ["ltp_test_defaults"],
@@ -9876,6 +9949,15 @@
 }
 
 cc_test {
+    name: "ltp_madvise12",
+    stem: "madvise12",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/madvise/madvise12.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_mallinfo01",
     stem: "mallinfo01",
     defaults: ["ltp_test_defaults"],
@@ -13434,6 +13516,51 @@
 }
 
 cc_test {
+    name: "ltp_ptem02",
+    stem: "ptem02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem02.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_ptem03",
+    stem: "ptem03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem03.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_ptem04",
+    stem: "ptem04",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem04.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_ptem05",
+    stem: "ptem05",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem05.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_ptem06",
+    stem: "ptem06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem06.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_pth_str01",
     stem: "pth_str01",
     defaults: ["ltp_test_defaults"],
@@ -13679,6 +13806,24 @@
 }
 
 cc_test {
+    name: "ltp_pty08",
+    stem: "pty08",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/pty08.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_pty09",
+    stem: "pty09",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/pty09.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_pwrite01",
     stem: "pwrite01",
     defaults: ["ltp_test_defaults"],
@@ -14603,6 +14748,15 @@
 }
 
 cc_test {
+    name: "ltp_rt_sigqueueinfo02",
+    stem: "rt_sigqueueinfo02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/rt_sigqueueinfo/rt_sigqueueinfo02.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_rt_sigsuspend01",
     stem: "rt_sigsuspend01",
     defaults: ["ltp_test_defaults"],
@@ -16962,6 +17116,15 @@
 }
 
 cc_test {
+    name: "ltp_shell_c_child",
+    stem: "shell_c_child",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/lib/tests/shell_c_child.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_shell_test01",
     stem: "shell_test01",
     defaults: ["ltp_test_defaults"],
@@ -17713,6 +17876,78 @@
 }
 
 cc_test {
+    name: "ltp_statmount01",
+    stem: "statmount01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount01.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount02",
+    stem: "statmount02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount02.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount03",
+    stem: "statmount03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount03.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount04",
+    stem: "statmount04",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount04.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount05",
+    stem: "statmount05",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount05.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount06",
+    stem: "statmount06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount06.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount07",
+    stem: "statmount07",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount07.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_statmount08",
+    stem: "statmount08",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/statmount/statmount08.c"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_statvfs01",
     stem: "statvfs01",
     defaults: ["ltp_test_defaults"],
@@ -20319,14 +20554,6 @@
 }
 
 sh_test {
-    name: "ltp_testcases_bin_ftp01.sh",
-    src: "testcases/network/tcp_cmds/ftp/ftp01.sh",
-    sub_dir: "vts_ltp_tests/testcases/bin",
-    filename: "ftp01.sh",
-    compile_multilib: "both",
-}
-
-sh_test {
     name: "ltp_testcases_bin_ftrace_lib.sh",
     src: "testcases/kernel/tracing/ftrace_test/ftrace_lib.sh",
     sub_dir: "vts_ltp_tests/testcases/bin",
@@ -21567,6 +21794,14 @@
 }
 
 sh_test {
+    name: "ltp_testcases_bin_nfs10.sh",
+    src: "testcases/network/nfs/nfs_stress/nfs10.sh",
+    sub_dir: "vts_ltp_tests/testcases/bin",
+    filename: "nfs10.sh",
+    compile_multilib: "both",
+}
+
+sh_test {
     name: "ltp_testcases_bin_nfs_lib.sh",
     src: "testcases/network/nfs/nfs_stress/nfs_lib.sh",
     sub_dir: "vts_ltp_tests/testcases/bin",
diff --git a/testcases/Android.bp b/testcases/Android.bp
index 25d3e2a..232f991 100644
--- a/testcases/Android.bp
+++ b/testcases/Android.bp
@@ -594,6 +594,15 @@
 }
 
 sh_test {
+    name: "ltp_testcases_realtime_run.sh",
+    src: "realtime/run.sh",
+    sub_dir: "vts_ltp_tests/testcases/realtime",
+    filename: "run.sh",
+    compile_multilib: "both",
+    auto_gen_config: false,
+}
+
+sh_test {
     name: "ltp_testcases_realtime_scripts___init__.py",
     src: "realtime/scripts/__init__.py",
     sub_dir: "vts_ltp_tests/testcases/realtime/scripts",