Update prebuilts for v35.0

Change-Id: I68e0855c3b4fa6855b8d561fd93421d7eabf45bd
diff --git a/python/perfetto/prebuilts/manifests/trace_processor_shell.py b/python/perfetto/prebuilts/manifests/trace_processor_shell.py
index 2e9e826..26837e1 100755
--- a/python/perfetto/prebuilts/manifests/trace_processor_shell.py
+++ b/python/perfetto/prebuilts/manifests/trace_processor_shell.py
@@ -1,15 +1,15 @@
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8714576,
+        8944520,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/trace_processor_shell',
     'sha256':
-        '9bdb89493f0f00db5d3a73166450ac2f6ee830de16415e79c5a0234990caa644',
+        'c86b513fa22ce78b648703650260aefe6491871dbe725288b78a69788d6020ac',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7286968,
+        7469080,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/trace_processor_shell',
     'sha256':
-        '948536035fbe680b47b94a99d320ff459450738e4aeeb16cef18364f0023622b',
+        'feab373e062a77d1a55196be118f615dfec8ca7b415f18312d1a5437363badbb',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8576688,
+        8790800,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/trace_processor_shell',
     'sha256':
-        '493698c81fffcabc340c72831b175962dba5a31dfe8572a6d5af083a116af4f8',
+        '39057fd7745d06a93d62c9cbd6cc4ea815722f4dc84f7a89d976c2fdcf5dd626',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        6125384,
+        6275264,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/trace_processor_shell',
     'sha256':
-        '53f1e27603695cf92d22519993b6eafa9c60957d9cb33bd0b300df8573b87ebb',
+        '278ca99a7d7987d20969893728ccd1b762c03d26556393dfbf6e060f11182d5a',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8036288,
+        8224488,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/trace_processor_shell',
     'sha256':
-        '2a2cda222c9d5e18b638057688babb00a3a975ccd4b7dd65f26211c2cb7767f9',
+        '7024bd0fe392b504822c9890c32b58a55dd0765c00174db10b2e8e2e2e8d620e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,55 +75,55 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        5813384,
+        5944472,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/trace_processor_shell',
     'sha256':
-        'f3ec4c194d0b06af5b296c1c479e6b29090e6b7cc7e58fbd55ca2919a126f0ee'
+        '0eec15e71a3c01276c40f16f83fea3f7355da8a6e98ffdd026623b609b714819'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7294768,
+        7438128,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/trace_processor_shell',
     'sha256':
-        'f44f47d4b873ec68b6fa4f4c69a3e5a13d58b4d9cb2ec591fa687d4480c1950b'
+        '64bc03f44c0c905f9083c7bf8c7ca69d8b438c06e1870ed9ec288beb1afd8c08'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8090716,
+        8283228,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/trace_processor_shell',
     'sha256':
-        '5636d8251747376787640bc3a4894ecf3091e4bf3d38b007003e1992fc5792df'
+        'beef1a8d34b1744da530d052cf7981ab682767bf3982b88cf1cf63bc7e0e7d22'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8359784,
+        8552296,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/trace_processor_shell',
     'sha256':
-        '50440fa055ab998f6cf24f9a9a7388520cc854708735521505e10291bc52f3d0'
+        'a5032afd033d8b9ac5b1371b7af16f55b375fa64868dbdc4add485fef7cd2c0d'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'trace_processor_shell.exe',
     'file_size':
-        8130560,
+        8205312,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/trace_processor_shell.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/trace_processor_shell.exe',
     'sha256':
-        '5cbcf98e29a2d989523235e11e4e0dade692a295ebf47a6c93a09a050ce9bc91',
+        '179601bcf6d93e4bd61ac001c4a0ab07fa6a2a7e4d09851feb4ee2040fda1653',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/python/perfetto/prebuilts/manifests/tracebox.py b/python/perfetto/prebuilts/manifests/tracebox.py
index 46b064a..12b8289 100755
--- a/python/perfetto/prebuilts/manifests/tracebox.py
+++ b/python/perfetto/prebuilts/manifests/tracebox.py
@@ -1,15 +1,15 @@
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1432064,
+        1448968,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
     'sha256':
-        '4ceb7646cd99303224ab5e7ff0a9f84c04f3c5466fff65a55dab65171ae9d482',
+        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1325704,
+        1342680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
     'sha256':
-        '2c560fcce5e19eb692e50487af134e2078347cdb79decba0c572917860528388',
+        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2155496,
+        2174120,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
     'sha256':
-        '10b92180bb461a7e21be3f8b3d4640430a98d0547238ce095709213b378217d2',
+        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1288764,
+        1300260,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
     'sha256':
-        'fa28950ce2b7a9345fbb9272f2dd04d3d4eb2a87f021df25e1e649840eae60b5',
+        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2082704,
+        2099272,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
     'sha256':
-        '85c371d79b8e23d22a293c29e6399dc311d891a6bd85d7eeaf2cb0179c69eb27',
+        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,42 +75,42 @@
     'file_name':
         'tracebox',
     'file_size':
-        1169364,
+        1181652,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
     'sha256':
-        '40a3f31600f02dea10e290134d5c862e0e717f4f039756889a4e72c60f1591b6'
+        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1776296,
+        1788584,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
     'sha256':
-        '562505fca18b34a97687dc002aeebcbf20acef68c8a8e48bed6d618c20e07c92'
+        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1767340,
+        1779628,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
     'sha256':
-        'eb47eb43ba93403557dd15a61196799e945ec324d96109db2f155fb131f9996a'
+        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2054824,
+        2063016,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
     'sha256':
-        'a3ae6d108e041ba368a9770f952772f111865d4eff7c8e4e4e2f653f45017948'
+        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
 }]
diff --git a/python/perfetto/prebuilts/manifests/traceconv.py b/python/perfetto/prebuilts/manifests/traceconv.py
index b093ac6..5ed488b 100755
--- a/python/perfetto/prebuilts/manifests/traceconv.py
+++ b/python/perfetto/prebuilts/manifests/traceconv.py
@@ -1,15 +1,15 @@
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        7904536,
+        8118096,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
     'sha256':
-        '037f84ac943f3f4d75447c668cc49c966fe3d85eca3a455c958b24fc6a9e314a',
+        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6554600,
+        6720184,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
     'sha256':
-        'eda545ef4fa37fdfa1b47ced7cbbe0aa3c0df9bd161cacd7c78e6c55aef98d20',
+        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7664384,
+        7871712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
     'sha256':
-        '24285e6e0e873d393fa5a993bac18ec8e1ab5fae6f4e3453214e095ef36e4c45',
+        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5657944,
+        5802976,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
     'sha256':
-        'c9af3d976f849fc75e96c2c552cb14fcc9eacce6fe7c45c4a8289080b0f66706',
+        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7184224,
+        7366464,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
     'sha256':
-        'c6dc936492d58a40cd8e0b58abc46bd479e0c1c387cd1ba29198a6c9b2000d7a',
+        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,55 +75,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5325260,
+        5448160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
     'sha256':
-        '963267dcb58cdde9f61a952e5cb7f3557833209d3251e7fdcefc3b52db54f77b'
+        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6572688,
+        6716048,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
     'sha256':
-        '87373c351fe5e947826cd957438cab8a37a352bf83b1cbbb15fe276eee9d873a'
+        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7303588,
+        7487908,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
     'sha256':
-        'dfc4e714963b5ed662d29d6028ffa69e67f8cd2f9a28223f715437a260fd456f'
+        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7482056,
+        7662280,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
     'sha256':
-        '79c666c629fcffd810635270b45e58b40ed253d22650f41550057e5d8f8c49a7'
+        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7072768,
+        7147008,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
     'sha256':
-        '40fac80fdeae443a924e160650c94629e6463c1fb5a4f04f4ef6e9e5e72a3965',
+        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/cpu_profile b/tools/cpu_profile
index 1dfdbb7..7f997b9 100755
--- a/tools/cpu_profile
+++ b/tools/cpu_profile
@@ -37,18 +37,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/traceconv.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        7904536,
+        8118096,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
     'sha256':
-        '037f84ac943f3f4d75447c668cc49c966fe3d85eca3a455c958b24fc6a9e314a',
+        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -58,11 +58,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6554600,
+        6720184,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
     'sha256':
-        'eda545ef4fa37fdfa1b47ced7cbbe0aa3c0df9bd161cacd7c78e6c55aef98d20',
+        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -72,11 +72,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7664384,
+        7871712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
     'sha256':
-        '24285e6e0e873d393fa5a993bac18ec8e1ab5fae6f4e3453214e095ef36e4c45',
+        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -86,11 +86,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5657944,
+        5802976,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
     'sha256':
-        'c9af3d976f849fc75e96c2c552cb14fcc9eacce6fe7c45c4a8289080b0f66706',
+        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -100,11 +100,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7184224,
+        7366464,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
     'sha256':
-        'c6dc936492d58a40cd8e0b58abc46bd479e0c1c387cd1ba29198a6c9b2000d7a',
+        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -114,55 +114,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5325260,
+        5448160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
     'sha256':
-        '963267dcb58cdde9f61a952e5cb7f3557833209d3251e7fdcefc3b52db54f77b'
+        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6572688,
+        6716048,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
     'sha256':
-        '87373c351fe5e947826cd957438cab8a37a352bf83b1cbbb15fe276eee9d873a'
+        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7303588,
+        7487908,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
     'sha256':
-        'dfc4e714963b5ed662d29d6028ffa69e67f8cd2f9a28223f715437a260fd456f'
+        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7482056,
+        7662280,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
     'sha256':
-        '79c666c629fcffd810635270b45e58b40ed253d22650f41550057e5d8f8c49a7'
+        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7072768,
+        7147008,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
     'sha256':
-        '40fac80fdeae443a924e160650c94629e6463c1fb5a4f04f4ef6e9e5e72a3965',
+        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/heap_profile b/tools/heap_profile
index 6e32c4b..f38b850 100755
--- a/tools/heap_profile
+++ b/tools/heap_profile
@@ -34,18 +34,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/traceconv.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        7904536,
+        8118096,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
     'sha256':
-        '037f84ac943f3f4d75447c668cc49c966fe3d85eca3a455c958b24fc6a9e314a',
+        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -55,11 +55,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6554600,
+        6720184,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
     'sha256':
-        'eda545ef4fa37fdfa1b47ced7cbbe0aa3c0df9bd161cacd7c78e6c55aef98d20',
+        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -69,11 +69,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7664384,
+        7871712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
     'sha256':
-        '24285e6e0e873d393fa5a993bac18ec8e1ab5fae6f4e3453214e095ef36e4c45',
+        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -83,11 +83,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5657944,
+        5802976,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
     'sha256':
-        'c9af3d976f849fc75e96c2c552cb14fcc9eacce6fe7c45c4a8289080b0f66706',
+        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -97,11 +97,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7184224,
+        7366464,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
     'sha256':
-        'c6dc936492d58a40cd8e0b58abc46bd479e0c1c387cd1ba29198a6c9b2000d7a',
+        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -111,55 +111,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5325260,
+        5448160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
     'sha256':
-        '963267dcb58cdde9f61a952e5cb7f3557833209d3251e7fdcefc3b52db54f77b'
+        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6572688,
+        6716048,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
     'sha256':
-        '87373c351fe5e947826cd957438cab8a37a352bf83b1cbbb15fe276eee9d873a'
+        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7303588,
+        7487908,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
     'sha256':
-        'dfc4e714963b5ed662d29d6028ffa69e67f8cd2f9a28223f715437a260fd456f'
+        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7482056,
+        7662280,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
     'sha256':
-        '79c666c629fcffd810635270b45e58b40ed253d22650f41550057e5d8f8c49a7'
+        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7072768,
+        7147008,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
     'sha256':
-        '40fac80fdeae443a924e160650c94629e6463c1fb5a4f04f4ef6e9e5e72a3965',
+        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/record_android_trace b/tools/record_android_trace
index 6d6a46c..da2537b 100755
--- a/tools/record_android_trace
+++ b/tools/record_android_trace
@@ -33,18 +33,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/tracebox.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1432064,
+        1448968,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
     'sha256':
-        '4ceb7646cd99303224ab5e7ff0a9f84c04f3c5466fff65a55dab65171ae9d482',
+        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -54,11 +54,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1325704,
+        1342680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
     'sha256':
-        '2c560fcce5e19eb692e50487af134e2078347cdb79decba0c572917860528388',
+        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -68,11 +68,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2155496,
+        2174120,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
     'sha256':
-        '10b92180bb461a7e21be3f8b3d4640430a98d0547238ce095709213b378217d2',
+        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -82,11 +82,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1288764,
+        1300260,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
     'sha256':
-        'fa28950ce2b7a9345fbb9272f2dd04d3d4eb2a87f021df25e1e649840eae60b5',
+        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -96,11 +96,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2082704,
+        2099272,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
     'sha256':
-        '85c371d79b8e23d22a293c29e6399dc311d891a6bd85d7eeaf2cb0179c69eb27',
+        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -110,44 +110,44 @@
     'file_name':
         'tracebox',
     'file_size':
-        1169364,
+        1181652,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
     'sha256':
-        '40a3f31600f02dea10e290134d5c862e0e717f4f039756889a4e72c60f1591b6'
+        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1776296,
+        1788584,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
     'sha256':
-        '562505fca18b34a97687dc002aeebcbf20acef68c8a8e48bed6d618c20e07c92'
+        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1767340,
+        1779628,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
     'sha256':
-        'eb47eb43ba93403557dd15a61196799e945ec324d96109db2f155fb131f9996a'
+        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2054824,
+        2063016,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
     'sha256':
-        'a3ae6d108e041ba368a9770f952772f111865d4eff7c8e4e4e2f653f45017948'
+        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
 }]
 
 # ----- Amalgamator: end of python/perfetto/prebuilts/manifests/tracebox.py
diff --git a/tools/trace_processor b/tools/trace_processor
index 1ed7c63..c0d9c77 100755
--- a/tools/trace_processor
+++ b/tools/trace_processor
@@ -30,18 +30,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/trace_processor_shell.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8714576,
+        8944520,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/trace_processor_shell',
     'sha256':
-        '9bdb89493f0f00db5d3a73166450ac2f6ee830de16415e79c5a0234990caa644',
+        'c86b513fa22ce78b648703650260aefe6491871dbe725288b78a69788d6020ac',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7286968,
+        7469080,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/trace_processor_shell',
     'sha256':
-        '948536035fbe680b47b94a99d320ff459450738e4aeeb16cef18364f0023622b',
+        'feab373e062a77d1a55196be118f615dfec8ca7b415f18312d1a5437363badbb',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8576688,
+        8790800,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/trace_processor_shell',
     'sha256':
-        '493698c81fffcabc340c72831b175962dba5a31dfe8572a6d5af083a116af4f8',
+        '39057fd7745d06a93d62c9cbd6cc4ea815722f4dc84f7a89d976c2fdcf5dd626',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        6125384,
+        6275264,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/trace_processor_shell',
     'sha256':
-        '53f1e27603695cf92d22519993b6eafa9c60957d9cb33bd0b300df8573b87ebb',
+        '278ca99a7d7987d20969893728ccd1b762c03d26556393dfbf6e060f11182d5a',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8036288,
+        8224488,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/trace_processor_shell',
     'sha256':
-        '2a2cda222c9d5e18b638057688babb00a3a975ccd4b7dd65f26211c2cb7767f9',
+        '7024bd0fe392b504822c9890c32b58a55dd0765c00174db10b2e8e2e2e8d620e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,55 +107,55 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        5813384,
+        5944472,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/trace_processor_shell',
     'sha256':
-        'f3ec4c194d0b06af5b296c1c479e6b29090e6b7cc7e58fbd55ca2919a126f0ee'
+        '0eec15e71a3c01276c40f16f83fea3f7355da8a6e98ffdd026623b609b714819'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7294768,
+        7438128,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/trace_processor_shell',
     'sha256':
-        'f44f47d4b873ec68b6fa4f4c69a3e5a13d58b4d9cb2ec591fa687d4480c1950b'
+        '64bc03f44c0c905f9083c7bf8c7ca69d8b438c06e1870ed9ec288beb1afd8c08'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8090716,
+        8283228,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/trace_processor_shell',
     'sha256':
-        '5636d8251747376787640bc3a4894ecf3091e4bf3d38b007003e1992fc5792df'
+        'beef1a8d34b1744da530d052cf7981ab682767bf3982b88cf1cf63bc7e0e7d22'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8359784,
+        8552296,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/trace_processor_shell',
     'sha256':
-        '50440fa055ab998f6cf24f9a9a7388520cc854708735521505e10291bc52f3d0'
+        'a5032afd033d8b9ac5b1371b7af16f55b375fa64868dbdc4add485fef7cd2c0d'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'trace_processor_shell.exe',
     'file_size':
-        8130560,
+        8205312,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/trace_processor_shell.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/trace_processor_shell.exe',
     'sha256':
-        '5cbcf98e29a2d989523235e11e4e0dade692a295ebf47a6c93a09a050ce9bc91',
+        '179601bcf6d93e4bd61ac001c4a0ab07fa6a2a7e4d09851feb4ee2040fda1653',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/tracebox b/tools/tracebox
index bf03fa6..bd91789 100755
--- a/tools/tracebox
+++ b/tools/tracebox
@@ -30,18 +30,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/tracebox.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1432064,
+        1448968,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
     'sha256':
-        '4ceb7646cd99303224ab5e7ff0a9f84c04f3c5466fff65a55dab65171ae9d482',
+        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1325704,
+        1342680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
     'sha256':
-        '2c560fcce5e19eb692e50487af134e2078347cdb79decba0c572917860528388',
+        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2155496,
+        2174120,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
     'sha256':
-        '10b92180bb461a7e21be3f8b3d4640430a98d0547238ce095709213b378217d2',
+        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1288764,
+        1300260,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
     'sha256':
-        'fa28950ce2b7a9345fbb9272f2dd04d3d4eb2a87f021df25e1e649840eae60b5',
+        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2082704,
+        2099272,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
     'sha256':
-        '85c371d79b8e23d22a293c29e6399dc311d891a6bd85d7eeaf2cb0179c69eb27',
+        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,44 +107,44 @@
     'file_name':
         'tracebox',
     'file_size':
-        1169364,
+        1181652,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
     'sha256':
-        '40a3f31600f02dea10e290134d5c862e0e717f4f039756889a4e72c60f1591b6'
+        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1776296,
+        1788584,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
     'sha256':
-        '562505fca18b34a97687dc002aeebcbf20acef68c8a8e48bed6d618c20e07c92'
+        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1767340,
+        1779628,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
     'sha256':
-        'eb47eb43ba93403557dd15a61196799e945ec324d96109db2f155fb131f9996a'
+        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2054824,
+        2063016,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
     'sha256':
-        'a3ae6d108e041ba368a9770f952772f111865d4eff7c8e4e4e2f653f45017948'
+        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
 }]
 
 # ----- Amalgamator: end of python/perfetto/prebuilts/manifests/tracebox.py
diff --git a/tools/traceconv b/tools/traceconv
index 9298eb3..a704054 100755
--- a/tools/traceconv
+++ b/tools/traceconv
@@ -30,18 +30,18 @@
 
 
 # ----- Amalgamator: begin of python/perfetto/prebuilts/manifests/traceconv.py
-# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v34.0
+# This file has been generated by: /Users/hjd/src/perfetto/tools/roll-prebuilts v35.0
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        7904536,
+        8118096,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
     'sha256':
-        '037f84ac943f3f4d75447c668cc49c966fe3d85eca3a455c958b24fc6a9e314a',
+        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6554600,
+        6720184,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
     'sha256':
-        'eda545ef4fa37fdfa1b47ced7cbbe0aa3c0df9bd161cacd7c78e6c55aef98d20',
+        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7664384,
+        7871712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
     'sha256':
-        '24285e6e0e873d393fa5a993bac18ec8e1ab5fae6f4e3453214e095ef36e4c45',
+        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5657944,
+        5802976,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
     'sha256':
-        'c9af3d976f849fc75e96c2c552cb14fcc9eacce6fe7c45c4a8289080b0f66706',
+        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7184224,
+        7366464,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
     'sha256':
-        'c6dc936492d58a40cd8e0b58abc46bd479e0c1c387cd1ba29198a6c9b2000d7a',
+        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,55 +107,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5325260,
+        5448160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
     'sha256':
-        '963267dcb58cdde9f61a952e5cb7f3557833209d3251e7fdcefc3b52db54f77b'
+        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6572688,
+        6716048,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
     'sha256':
-        '87373c351fe5e947826cd957438cab8a37a352bf83b1cbbb15fe276eee9d873a'
+        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7303588,
+        7487908,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
     'sha256':
-        'dfc4e714963b5ed662d29d6028ffa69e67f8cd2f9a28223f715437a260fd456f'
+        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7482056,
+        7662280,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
     'sha256':
-        '79c666c629fcffd810635270b45e58b40ed253d22650f41550057e5d8f8c49a7'
+        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7072768,
+        7147008,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v34.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
     'sha256':
-        '40fac80fdeae443a924e160650c94629e6463c1fb5a4f04f4ef6e9e5e72a3965',
+        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
     'platform':
         'win32',
     'machine': ['amd64']