diff --git a/Android.bp b/Android.bp
index 5ed362b..75fe075 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5726,7 +5726,6 @@
 filegroup {
   name: "perfetto_src_trace_processor_lib",
   srcs: [
-    "src/trace_processor/args_table.cc",
     "src/trace_processor/filtered_row_index.cc",
     "src/trace_processor/gfp_flags.cc",
     "src/trace_processor/process_table.cc",
@@ -5830,6 +5829,7 @@
     "src/trace_processor/event_tracker.cc",
     "src/trace_processor/forwarding_trace_parser.cc",
     "src/trace_processor/ftrace_utils.cc",
+    "src/trace_processor/global_args_tracker.cc",
     "src/trace_processor/gzip_trace_parser.cc",
     "src/trace_processor/heap_profile_tracker.cc",
     "src/trace_processor/importers/ftrace/ftrace_module.cc",
@@ -5855,6 +5855,7 @@
     "src/trace_processor/trace_sorter.cc",
     "src/trace_processor/trace_storage.cc",
     "src/trace_processor/track_tracker.cc",
+    "src/trace_processor/variadic.cc",
     "src/trace_processor/virtual_destructors.cc",
   ],
 }
@@ -5876,7 +5877,6 @@
 filegroup {
   name: "perfetto_src_trace_processor_unittests",
   srcs: [
-    "src/trace_processor/args_table_unittest.cc",
     "src/trace_processor/clock_tracker_unittest.cc",
     "src/trace_processor/event_tracker_unittest.cc",
     "src/trace_processor/filtered_row_index_unittest.cc",