perfetto: roll prebuilts to v36.1

Change-Id: I05d393e30b221f820f56b2576ba120d20cc26efb
diff --git a/python/perfetto/prebuilts/manifests/trace_processor_shell.py b/python/perfetto/prebuilts/manifests/trace_processor_shell.py
index 26837e1..2d4aa09 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8944520,
+        9469488,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/trace_processor_shell',
     'sha256':
-        'c86b513fa22ce78b648703650260aefe6491871dbe725288b78a69788d6020ac',
+        '4e996a348a9d1260e7e466cd7c11e1b3dfd64af1f57c907dc89c224cd09fc9bd',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7469080,
+        7981448,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/trace_processor_shell',
     'sha256':
-        'feab373e062a77d1a55196be118f615dfec8ca7b415f18312d1a5437363badbb',
+        '4e24ec1d1bfe1421ea4b825beaf1bd1e717fc4fd950b427caf39cfe045e935bb',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8790800,
+        9326432,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/trace_processor_shell',
     'sha256':
-        '39057fd7745d06a93d62c9cbd6cc4ea815722f4dc84f7a89d976c2fdcf5dd626',
+        'd83dbf5700dbfd5dce6e29a63c6a2b9e3d284f7a536f945589983e62031d9b14',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        6275264,
+        6806348,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/trace_processor_shell',
     'sha256':
-        '278ca99a7d7987d20969893728ccd1b762c03d26556393dfbf6e060f11182d5a',
+        '31043ec3d87cbc1bd1017e9708b40e8f451c9c3e321e71c53025ae8e18e79576',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8224488,
+        8755632,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/trace_processor_shell',
     'sha256':
-        '7024bd0fe392b504822c9890c32b58a55dd0765c00174db10b2e8e2e2e8d620e',
+        '00b635fed0d3092a4301149194aae298f17c19c4b481c45b836afd16cd355c5f',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,55 +75,55 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        5944472,
+        6423712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/trace_processor_shell',
     'sha256':
-        '0eec15e71a3c01276c40f16f83fea3f7355da8a6e98ffdd026623b609b714819'
+        'a11e85691299d4225a0c7b93a945c0420f607c1f0152f1f10aa6587584a36ce5'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7438128,
+        7933752,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/trace_processor_shell',
     'sha256':
-        '64bc03f44c0c905f9083c7bf8c7ca69d8b438c06e1870ed9ec288beb1afd8c08'
+        'd234ecf707115656bfa95c71456c604f7740bb47ad74ee6d0cc272a0c1af6461'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8283228,
+        8803428,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/trace_processor_shell',
     'sha256':
-        'beef1a8d34b1744da530d052cf7981ab682767bf3982b88cf1cf63bc7e0e7d22'
+        '430e496df9f4466529f250efe5e46ae36083078b9fcce8bc0955c1639a767124'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8552296,
+        9068408,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/trace_processor_shell',
     'sha256':
-        'a5032afd033d8b9ac5b1371b7af16f55b375fa64868dbdc4add485fef7cd2c0d'
+        '15d3c345f1f018a014c1000d77cbcbd6650b3fdd12ee477acb256de7b30e97d6'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'trace_processor_shell.exe',
     'file_size':
-        8205312,
+        8707584,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/trace_processor_shell.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/trace_processor_shell.exe',
     'sha256':
-        '179601bcf6d93e4bd61ac001c4a0ab07fa6a2a7e4d09851feb4ee2040fda1653',
+        'ac17a142b1aa7ef9d20def21a234a1c351cbb4b7f89294bb6699f4e6d14c2f03',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/python/perfetto/prebuilts/manifests/tracebox.py b/python/perfetto/prebuilts/manifests/tracebox.py
index 12b8289..bef978c 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1448968,
+        1481952,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/tracebox',
     'sha256':
-        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
+        'e7c77d74925bd67245f551a638e61c1c365381fac9be067f8f4c2e9676609043',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1342680,
+        1375832,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/tracebox',
     'sha256':
-        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
+        'c9251b4011e8d47bb1562a955c817a2acf57c1407e3b39764b8fed4759f95db6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2174120,
+        2203800,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/tracebox',
     'sha256':
-        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
+        '557c7ebcc3f332762f7f26955e972b1b3b95c2e13943a103450eeccb7dba06ed',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1300260,
+        1319820,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/tracebox',
     'sha256':
-        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
+        'e2e13fedaae8c410f216622dac00c285f0ab640e003d54d194cbf47efeb39a25',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2099272,
+        2131848,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/tracebox',
     'sha256':
-        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
+        '3ec88db78050d04f6d1eb39281a624afeafc5b60fc68afe6f6f087c1bec5efde',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,42 +75,42 @@
     'file_name':
         'tracebox',
     'file_size':
-        1181652,
+        1202132,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/tracebox',
     'sha256':
-        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
+        '4c00429d86372ace2e4d7abe0ab50d76a99058a6c09306f2a9f18ff27b6e2c61'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1788584,
+        1817256,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/tracebox',
     'sha256':
-        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
+        '8d7e42af9e70d4e9ea2291c64f96747cf959933f646ac13cb69010f0b8c6f898'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1779628,
+        1812396,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/tracebox',
     'sha256':
-        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
+        '5f09c396ef0490cd32df302d09018b5e2200282a4dd958a1da7bd933955c1f68'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2063016,
+        2099880,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/tracebox',
     'sha256':
-        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
+        '7ee4a44b2fe585364e535c9fe63b9bc8bbd528439e1056bde8d6f7950f2eaa9f'
 }]
diff --git a/python/perfetto/prebuilts/manifests/traceconv.py b/python/perfetto/prebuilts/manifests/traceconv.py
index 5ed488b..00ad474 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        8118096,
+        8659480,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/traceconv',
     'sha256':
-        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
+        'd6ec1d157e8725b7969d50e8820e843210478079b3a4250561e07d102f300842',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -19,11 +19,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6720184,
+        7249160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/traceconv',
     'sha256':
-        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
+        '9a44e8f2015da5848e5bc1fb82ba0f64ac8a9e537fbd6720e3c3e225462fc266',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -33,11 +33,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7871712,
+        8419200,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/traceconv',
     'sha256':
-        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
+        'bb130168fbc53907c31c63a3b5e492c86fef47f652b6389a2f45405cbac7ae15',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -47,11 +47,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5802976,
+        6346768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/traceconv',
     'sha256':
-        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
+        'edf52cab0b36cfaf67fa12692fabcfaab4ac8b0a51f0af12c880d96cdd805cf1',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -61,11 +61,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7366464,
+        7909768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/traceconv',
     'sha256':
-        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
+        'eed5040fda205a3f47c26bd1f8204a8b711a138dd6017d58090dbe7a89b8631a',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -75,55 +75,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5448160,
+        5939680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/traceconv',
     'sha256':
-        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
+        'c2044ad1c5f39a2703d407e309698e56dab94b21fe35ab5869abd76f1380af66'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6716048,
+        7219864,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/traceconv',
     'sha256':
-        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
+        'a0aba8d140f892938f4428c4d4c7aabe2288e8faedbe6deb0e4a0dc073417339'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7487908,
+        8016292,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/traceconv',
     'sha256':
-        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
+        'fe103ee2bfa8d067fe4cb765f976af9394142888066e1a7728f4f9dab4197df8'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7662280,
+        8190672,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/traceconv',
     'sha256':
-        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
+        '174d8ce77f7e4edf28238c022f03e4d966252928d49ccb31b417210e481b07e2'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7147008,
+        7662592,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/traceconv.exe',
     'sha256':
-        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
+        '339ecd52e67eb0a88ae1a7b18ac09ad7f0a6969953659d78ea3f3ce606b9234f',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/cpu_profile b/tools/cpu_profile
index 7f997b9..b458f18 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        8118096,
+        8659480,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/traceconv',
     'sha256':
-        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
+        'd6ec1d157e8725b7969d50e8820e843210478079b3a4250561e07d102f300842',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -58,11 +58,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6720184,
+        7249160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/traceconv',
     'sha256':
-        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
+        '9a44e8f2015da5848e5bc1fb82ba0f64ac8a9e537fbd6720e3c3e225462fc266',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -72,11 +72,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7871712,
+        8419200,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/traceconv',
     'sha256':
-        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
+        'bb130168fbc53907c31c63a3b5e492c86fef47f652b6389a2f45405cbac7ae15',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -86,11 +86,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5802976,
+        6346768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/traceconv',
     'sha256':
-        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
+        'edf52cab0b36cfaf67fa12692fabcfaab4ac8b0a51f0af12c880d96cdd805cf1',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -100,11 +100,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7366464,
+        7909768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/traceconv',
     'sha256':
-        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
+        'eed5040fda205a3f47c26bd1f8204a8b711a138dd6017d58090dbe7a89b8631a',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -114,55 +114,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5448160,
+        5939680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/traceconv',
     'sha256':
-        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
+        'c2044ad1c5f39a2703d407e309698e56dab94b21fe35ab5869abd76f1380af66'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6716048,
+        7219864,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/traceconv',
     'sha256':
-        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
+        'a0aba8d140f892938f4428c4d4c7aabe2288e8faedbe6deb0e4a0dc073417339'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7487908,
+        8016292,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/traceconv',
     'sha256':
-        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
+        'fe103ee2bfa8d067fe4cb765f976af9394142888066e1a7728f4f9dab4197df8'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7662280,
+        8190672,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/traceconv',
     'sha256':
-        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
+        '174d8ce77f7e4edf28238c022f03e4d966252928d49ccb31b417210e481b07e2'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7147008,
+        7662592,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/traceconv.exe',
     'sha256':
-        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
+        '339ecd52e67eb0a88ae1a7b18ac09ad7f0a6969953659d78ea3f3ce606b9234f',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/heap_profile b/tools/heap_profile
index f38b850..4364379 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        8118096,
+        8659480,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/traceconv',
     'sha256':
-        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
+        'd6ec1d157e8725b7969d50e8820e843210478079b3a4250561e07d102f300842',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -55,11 +55,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6720184,
+        7249160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/traceconv',
     'sha256':
-        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
+        '9a44e8f2015da5848e5bc1fb82ba0f64ac8a9e537fbd6720e3c3e225462fc266',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -69,11 +69,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7871712,
+        8419200,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/traceconv',
     'sha256':
-        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
+        'bb130168fbc53907c31c63a3b5e492c86fef47f652b6389a2f45405cbac7ae15',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -83,11 +83,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5802976,
+        6346768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/traceconv',
     'sha256':
-        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
+        'edf52cab0b36cfaf67fa12692fabcfaab4ac8b0a51f0af12c880d96cdd805cf1',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -97,11 +97,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7366464,
+        7909768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/traceconv',
     'sha256':
-        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
+        'eed5040fda205a3f47c26bd1f8204a8b711a138dd6017d58090dbe7a89b8631a',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -111,55 +111,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5448160,
+        5939680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/traceconv',
     'sha256':
-        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
+        'c2044ad1c5f39a2703d407e309698e56dab94b21fe35ab5869abd76f1380af66'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6716048,
+        7219864,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/traceconv',
     'sha256':
-        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
+        'a0aba8d140f892938f4428c4d4c7aabe2288e8faedbe6deb0e4a0dc073417339'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7487908,
+        8016292,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/traceconv',
     'sha256':
-        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
+        'fe103ee2bfa8d067fe4cb765f976af9394142888066e1a7728f4f9dab4197df8'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7662280,
+        8190672,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/traceconv',
     'sha256':
-        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
+        '174d8ce77f7e4edf28238c022f03e4d966252928d49ccb31b417210e481b07e2'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7147008,
+        7662592,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/traceconv.exe',
     'sha256':
-        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
+        '339ecd52e67eb0a88ae1a7b18ac09ad7f0a6969953659d78ea3f3ce606b9234f',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/record_android_trace b/tools/record_android_trace
index da2537b..71101d0 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1448968,
+        1481952,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/tracebox',
     'sha256':
-        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
+        'e7c77d74925bd67245f551a638e61c1c365381fac9be067f8f4c2e9676609043',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -54,11 +54,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1342680,
+        1375832,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/tracebox',
     'sha256':
-        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
+        'c9251b4011e8d47bb1562a955c817a2acf57c1407e3b39764b8fed4759f95db6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -68,11 +68,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2174120,
+        2203800,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/tracebox',
     'sha256':
-        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
+        '557c7ebcc3f332762f7f26955e972b1b3b95c2e13943a103450eeccb7dba06ed',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -82,11 +82,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1300260,
+        1319820,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/tracebox',
     'sha256':
-        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
+        'e2e13fedaae8c410f216622dac00c285f0ab640e003d54d194cbf47efeb39a25',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -96,11 +96,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2099272,
+        2131848,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/tracebox',
     'sha256':
-        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
+        '3ec88db78050d04f6d1eb39281a624afeafc5b60fc68afe6f6f087c1bec5efde',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -110,44 +110,44 @@
     'file_name':
         'tracebox',
     'file_size':
-        1181652,
+        1202132,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/tracebox',
     'sha256':
-        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
+        '4c00429d86372ace2e4d7abe0ab50d76a99058a6c09306f2a9f18ff27b6e2c61'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1788584,
+        1817256,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/tracebox',
     'sha256':
-        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
+        '8d7e42af9e70d4e9ea2291c64f96747cf959933f646ac13cb69010f0b8c6f898'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1779628,
+        1812396,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/tracebox',
     'sha256':
-        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
+        '5f09c396ef0490cd32df302d09018b5e2200282a4dd958a1da7bd933955c1f68'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2063016,
+        2099880,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/tracebox',
     'sha256':
-        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
+        '7ee4a44b2fe585364e535c9fe63b9bc8bbd528439e1056bde8d6f7950f2eaa9f'
 }]
 
 # ----- Amalgamator: end of python/perfetto/prebuilts/manifests/tracebox.py
diff --git a/tools/roll-prebuilts b/tools/roll-prebuilts
index 08666ad..689f046 100755
--- a/tools/roll-prebuilts
+++ b/tools/roll-prebuilts
@@ -124,7 +124,7 @@
   content = '# This file has been generated by: {script} {git_revision}\n'
   content += '{tool_uppercase}_MANIFEST = {manifests}\n'
   content = content.format(
-      script=__file__,
+      script=os.path.relpath(__file__),
       tool_uppercase=tool_name.upper(),
       git_revision=git_revision,
       manifests=str(manifests))
diff --git a/tools/trace_processor b/tools/trace_processor
index c0d9c77..860c1d2 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACE_PROCESSOR_SHELL_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8944520,
+        9469488,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/trace_processor_shell',
     'sha256':
-        'c86b513fa22ce78b648703650260aefe6491871dbe725288b78a69788d6020ac',
+        '4e996a348a9d1260e7e466cd7c11e1b3dfd64af1f57c907dc89c224cd09fc9bd',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7469080,
+        7981448,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/trace_processor_shell',
     'sha256':
-        'feab373e062a77d1a55196be118f615dfec8ca7b415f18312d1a5437363badbb',
+        '4e24ec1d1bfe1421ea4b825beaf1bd1e717fc4fd950b427caf39cfe045e935bb',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8790800,
+        9326432,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/trace_processor_shell',
     'sha256':
-        '39057fd7745d06a93d62c9cbd6cc4ea815722f4dc84f7a89d976c2fdcf5dd626',
+        'd83dbf5700dbfd5dce6e29a63c6a2b9e3d284f7a536f945589983e62031d9b14',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        6275264,
+        6806348,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/trace_processor_shell',
     'sha256':
-        '278ca99a7d7987d20969893728ccd1b762c03d26556393dfbf6e060f11182d5a',
+        '31043ec3d87cbc1bd1017e9708b40e8f451c9c3e321e71c53025ae8e18e79576',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8224488,
+        8755632,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/trace_processor_shell',
     'sha256':
-        '7024bd0fe392b504822c9890c32b58a55dd0765c00174db10b2e8e2e2e8d620e',
+        '00b635fed0d3092a4301149194aae298f17c19c4b481c45b836afd16cd355c5f',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,55 +107,55 @@
     'file_name':
         'trace_processor_shell',
     'file_size':
-        5944472,
+        6423712,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/trace_processor_shell',
     'sha256':
-        '0eec15e71a3c01276c40f16f83fea3f7355da8a6e98ffdd026623b609b714819'
+        'a11e85691299d4225a0c7b93a945c0420f607c1f0152f1f10aa6587584a36ce5'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        7438128,
+        7933752,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/trace_processor_shell',
     'sha256':
-        '64bc03f44c0c905f9083c7bf8c7ca69d8b438c06e1870ed9ec288beb1afd8c08'
+        'd234ecf707115656bfa95c71456c604f7740bb47ad74ee6d0cc272a0c1af6461'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8283228,
+        8803428,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/trace_processor_shell',
     'sha256':
-        'beef1a8d34b1744da530d052cf7981ab682767bf3982b88cf1cf63bc7e0e7d22'
+        '430e496df9f4466529f250efe5e46ae36083078b9fcce8bc0955c1639a767124'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'trace_processor_shell',
     'file_size':
-        8552296,
+        9068408,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/trace_processor_shell',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/trace_processor_shell',
     'sha256':
-        'a5032afd033d8b9ac5b1371b7af16f55b375fa64868dbdc4add485fef7cd2c0d'
+        '15d3c345f1f018a014c1000d77cbcbd6650b3fdd12ee477acb256de7b30e97d6'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'trace_processor_shell.exe',
     'file_size':
-        8205312,
+        8707584,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/trace_processor_shell.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/trace_processor_shell.exe',
     'sha256':
-        '179601bcf6d93e4bd61ac001c4a0ab07fa6a2a7e4d09851feb4ee2040fda1653',
+        'ac17a142b1aa7ef9d20def21a234a1c351cbb4b7f89294bb6699f4e6d14c2f03',
     'platform':
         'win32',
     'machine': ['amd64']
diff --git a/tools/tracebox b/tools/tracebox
index bd91789..2635366 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACEBOX_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'tracebox',
     'file_size':
-        1448968,
+        1481952,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/tracebox',
     'sha256':
-        '37754cc3cd31016e3d8290812a10e36a3562cfba42c118d14d3871fd9368e42f',
+        'e7c77d74925bd67245f551a638e61c1c365381fac9be067f8f4c2e9676609043',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1342680,
+        1375832,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/tracebox',
     'sha256':
-        'f666d05165b5be24d94e696819849e46931fa03e19f9d168df1af35d5b7036f0',
+        'c9251b4011e8d47bb1562a955c817a2acf57c1407e3b39764b8fed4759f95db6',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2174120,
+        2203800,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/tracebox',
     'sha256':
-        '4ce7538ca6df8543483a125ca21408b114d45d58caebd958e61043e905a79c6c',
+        '557c7ebcc3f332762f7f26955e972b1b3b95c2e13943a103450eeccb7dba06ed',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        1300260,
+        1319820,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/tracebox',
     'sha256':
-        '6b79eb26abe89ef780e08c99c2a4a7f0dbb5bda512efa2f96c952b3235d90661',
+        'e2e13fedaae8c410f216622dac00c285f0ab640e003d54d194cbf47efeb39a25',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'tracebox',
     'file_size':
-        2099272,
+        2131848,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/tracebox',
     'sha256':
-        'caf51d83afaedbbf1d388728f6582546a08f5c504ddb01aec1079ad6f240a9b6',
+        '3ec88db78050d04f6d1eb39281a624afeafc5b60fc68afe6f6f087c1bec5efde',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,44 +107,44 @@
     'file_name':
         'tracebox',
     'file_size':
-        1181652,
+        1202132,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/tracebox',
     'sha256':
-        'c60f4b0f2f770956258d9e6fb5d63d0a36162a42d5bf5be737f755fc302309f7'
+        '4c00429d86372ace2e4d7abe0ab50d76a99058a6c09306f2a9f18ff27b6e2c61'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'tracebox',
     'file_size':
-        1788584,
+        1817256,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/tracebox',
     'sha256':
-        '652839a91131c82e0ef16fb15b4116b20d9c447956589eb10f413a303898205f'
+        '8d7e42af9e70d4e9ea2291c64f96747cf959933f646ac13cb69010f0b8c6f898'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'tracebox',
     'file_size':
-        1779628,
+        1812396,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/tracebox',
     'sha256':
-        '1e8a786f056ace09c7f5cff177c2f9217fb137dcc0d81da9f6cc6d4d034599d7'
+        '5f09c396ef0490cd32df302d09018b5e2200282a4dd958a1da7bd933955c1f68'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'tracebox',
     'file_size':
-        2063016,
+        2099880,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/tracebox',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/tracebox',
     'sha256':
-        '1370564630b3d8f7cccd89fa4f27ac9b553c36b7222500cec4c0408419444480'
+        '7ee4a44b2fe585364e535c9fe63b9bc8bbd528439e1056bde8d6f7950f2eaa9f'
 }]
 
 # ----- Amalgamator: end of python/perfetto/prebuilts/manifests/tracebox.py
diff --git a/tools/traceconv b/tools/traceconv
index a704054..0b2039d 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 v35.0
+# This file has been generated by: tools/roll-prebuilts v36.1
 TRACECONV_MANIFEST = [{
     'arch':
         'mac-amd64',
     'file_name':
         'traceconv',
     'file_size':
-        8118096,
+        8659480,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-amd64/traceconv',
     'sha256':
-        '38927d082f6a36cc86f0ede0bebe00ce75069e3183a52884b29a9d38d0f259b2',
+        'd6ec1d157e8725b7969d50e8820e843210478079b3a4250561e07d102f300842',
     'platform':
         'darwin',
     'machine': ['x86_64']
@@ -51,11 +51,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        6720184,
+        7249160,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/mac-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/mac-arm64/traceconv',
     'sha256':
-        '6907eb5010866454bcd7430b154a2320c97c9637cf20c249302e3ea58347ceb6',
+        '9a44e8f2015da5848e5bc1fb82ba0f64ac8a9e537fbd6720e3c3e225462fc266',
     'platform':
         'darwin',
     'machine': ['arm64']
@@ -65,11 +65,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7871712,
+        8419200,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-amd64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-amd64/traceconv',
     'sha256':
-        'c5f261e8a910a0c4192e916c0f0e96cfe1bf599b1cdb415058cd3a533e05f956',
+        'bb130168fbc53907c31c63a3b5e492c86fef47f652b6389a2f45405cbac7ae15',
     'platform':
         'linux',
     'machine': ['x86_64']
@@ -79,11 +79,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        5802976,
+        6346768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm/traceconv',
     'sha256':
-        'b4796052b8761cd1cc9e64831764224fb8dfbc80e067db963a27eed3caf56f0d',
+        'edf52cab0b36cfaf67fa12692fabcfaab4ac8b0a51f0af12c880d96cdd805cf1',
     'platform':
         'linux',
     'machine': ['armv6l', 'armv7l', 'armv8l']
@@ -93,11 +93,11 @@
     'file_name':
         'traceconv',
     'file_size':
-        7366464,
+        7909768,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/linux-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/linux-arm64/traceconv',
     'sha256':
-        '2760c807601d07e9073d5f9266417f07466a1cd706a404b6d535846dd463160e',
+        'eed5040fda205a3f47c26bd1f8204a8b711a138dd6017d58090dbe7a89b8631a',
     'platform':
         'linux',
     'machine': ['aarch64']
@@ -107,55 +107,55 @@
     'file_name':
         'traceconv',
     'file_size':
-        5448160,
+        5939680,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm/traceconv',
     'sha256':
-        'fab85439606a467847c67d5fa9952e433d4eacdc49ef37b94542dc9b891bcfbc'
+        'c2044ad1c5f39a2703d407e309698e56dab94b21fe35ab5869abd76f1380af66'
 }, {
     'arch':
         'android-arm64',
     'file_name':
         'traceconv',
     'file_size':
-        6716048,
+        7219864,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-arm64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-arm64/traceconv',
     'sha256':
-        '03e2473ddcac1b99fe670d2ab32381b8bdb4e3f3f406bf964c635fac91add543'
+        'a0aba8d140f892938f4428c4d4c7aabe2288e8faedbe6deb0e4a0dc073417339'
 }, {
     'arch':
         'android-x86',
     'file_name':
         'traceconv',
     'file_size':
-        7487908,
+        8016292,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x86/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x86/traceconv',
     'sha256':
-        '3a0372d6f308c836732bdccc913a6ef2c76977a2fa626bf527b4d7128cb9cce3'
+        'fe103ee2bfa8d067fe4cb765f976af9394142888066e1a7728f4f9dab4197df8'
 }, {
     'arch':
         'android-x64',
     'file_name':
         'traceconv',
     'file_size':
-        7662280,
+        8190672,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/android-x64/traceconv',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/android-x64/traceconv',
     'sha256':
-        '7abcc69eba8a5722fb03c6076500ee9958659d5393a63c8e1983cb17f1b92bcb'
+        '174d8ce77f7e4edf28238c022f03e4d966252928d49ccb31b417210e481b07e2'
 }, {
     'arch':
         'windows-amd64',
     'file_name':
         'traceconv.exe',
     'file_size':
-        7147008,
+        7662592,
     'url':
-        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v35.0/windows-amd64/traceconv.exe',
+        'https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v36.1/windows-amd64/traceconv.exe',
     'sha256':
-        '7af5f61a0fa53aa3741a71546ca3a9cf7ad0e24b5d7c6331cf032b18f93a93c7',
+        '339ecd52e67eb0a88ae1a7b18ac09ad7f0a6969953659d78ea3f3ce606b9234f',
     'platform':
         'win32',
     'machine': ['amd64']