Update NDK prebuilts to build 10306210.

Taken from branch aosp-simpleperf-release.

Bug: 285152880
Test: run test.py for android N-V on both devices and emulators.
Test: run test.py from hosts linux/darwin/windows.
Change-Id: I8799aac32ffb45bcd7abc20c562e7e020a36ffd2

28 files changed, 2659 insertions, 495 deletions

diff --git a/ChangeLog b/ChangeLog
index b3ff6a6..76474ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+build 10306210 (Jun 12, 2023)
+record cmd: Add --decode-etm to decode ETM data while recording.
+            It saves the space storing raw ETM data.
+            Store lost/cut record info in recording file.
+            Report lost samples in kernel space and user space.
+inject cmd: Accept missing aux data.
+            Add build id in AutoFDO output.
+gecko_profile_generatory.py: color off-cpu frames blue and jit app cache frames green.
+
+
 build 9796343 (March 22, 2023)
 Fix dozens of security bugs detected by fuzzer.
 record cmd:
diff --git a/app_profiler.py b/app_profiler.py
index 808e3e9..a6399ef 100755
--- a/app_profiler.py
+++ b/app_profiler.py
@@ -233,7 +233,7 @@ class ProfilerBase(object):
         raise NotImplementedError
 
     def start_profiling(self, target_args):
-        """Start simpleperf reocrd process on device."""
+        """Start simpleperf record process on device."""
         args = ['/data/local/tmp/simpleperf', 'record', '-o', '/data/local/tmp/perf.data',
                 self.args.record_options]
         if self.adb.run(['shell', 'ls', NATIVE_LIBS_DIR_ON_DEVICE]):
diff --git a/bin/android/arm/simpleperf b/bin/android/arm/simpleperf
index bf6b056..51b7582 100755
--- a/bin/android/arm/simpleperf
+++ b/bin/android/arm/simpleperf
diff --git a/bin/android/arm64/simpleperf b/bin/android/arm64/simpleperf
index a81a14b..0784a6a 100755
--- a/bin/android/arm64/simpleperf
+++ b/bin/android/arm64/simpleperf
diff --git a/bin/android/x86/simpleperf b/bin/android/x86/simpleperf
index 32fc919..1e3be65 100755
--- a/bin/android/x86/simpleperf
+++ b/bin/android/x86/simpleperf
diff --git a/bin/android/x86_64/simpleperf b/bin/android/x86_64/simpleperf
index cb7f7bf..88e10ab 100755
--- a/bin/android/x86_64/simpleperf
+++ b/bin/android/x86_64/simpleperf
diff --git a/bin/darwin/x86_64/libsimpleperf_report.dylib b/bin/darwin/x86_64/libsimpleperf_report.dylib
index cd829eb..73d246d 100755
--- a/bin/darwin/x86_64/libsimpleperf_report.dylib
+++ b/bin/darwin/x86_64/libsimpleperf_report.dylib
diff --git a/bin/darwin/x86_64/simpleperf b/bin/darwin/x86_64/simpleperf
index 4a4396d..d7edebe 100755
--- a/bin/darwin/x86_64/simpleperf
+++ b/bin/darwin/x86_64/simpleperf
diff --git a/bin/linux/x86_64/libsimpleperf_report.so b/bin/linux/x86_64/libsimpleperf_report.so
index 1f9f13f..5d946c8 100755
--- a/bin/linux/x86_64/libsimpleperf_report.so
+++ b/bin/linux/x86_64/libsimpleperf_report.so
diff --git a/bin/linux/x86_64/simpleperf b/bin/linux/x86_64/simpleperf
index d8dd840..9632b87 100755
--- a/bin/linux/x86_64/simpleperf
+++ b/bin/linux/x86_64/simpleperf
diff --git a/bin/windows/x86_64/libsimpleperf_report.dll b/bin/windows/x86_64/libsimpleperf_report.dll
index 0e9e289..dc6278d 100755
--- a/bin/windows/x86_64/libsimpleperf_report.dll
+++ b/bin/windows/x86_64/libsimpleperf_report.dll
diff --git a/bin/windows/x86_64/simpleperf.exe b/bin/windows/x86_64/simpleperf.exe
index 1d9a97e..5e4ebc2 100755
--- a/bin/windows/x86_64/simpleperf.exe
+++ b/bin/windows/x86_64/simpleperf.exe
diff --git a/binary_cache_builder.py b/binary_cache_builder.py
index 46c8532..31f03e6 100755
--- a/binary_cache_builder.py
+++ b/binary_cache_builder.py
@@ -48,8 +48,7 @@ class BinaryCache:
         if build_id:
             filename = device_path.split('/')[-1]
             # Add build id to make the filename unique.
-            unique_filename = build_id[2:] + '-' + filename
-            return self.binary_dir / unique_filename
+            return self.binary_dir / build_id[2:] / filename
 
         # For elf file without build id, we can only follow its path on device. Otherwise,
         # simpleperf can't find it. However, we don't prefer this way. Because:
@@ -110,13 +109,18 @@ class BinarySourceFromDevice(BinarySource):
         else:
             logging.info('pull file to binary_cache: %s to %s', path, binary_cache_file)
             target_dir = binary_cache_file.parent
-            if not target_dir.is_dir():
-                os.makedirs(target_dir)
-            if binary_cache_file.is_file():
-                binary_cache_file.unlink()
-            self.pull_file_from_device(path, binary_cache_file)
-
-    def pull_file_from_device(self, device_path: str, host_path: Path):
+            try:
+                os.makedirs(target_dir, exist_ok=True)
+                if binary_cache_file.is_file():
+                    binary_cache_file.unlink()
+                success = self.pull_file_from_device(path, binary_cache_file)
+            except FileNotFoundError:
+                # It happens on windows when the filename or extension is too long.
+                success = False
+            if not success:
+                logging.warning('failed to pull %s from device', path)
+
+    def pull_file_from_device(self, device_path: str, host_path: Path) -> bool:
         if self.adb.run(['pull', device_path, str(host_path)]):
             return True
         # On non-root devices, we can't pull /data/app/XXX/base.odex directly.
@@ -126,7 +130,6 @@ class BinarySourceFromDevice(BinarySource):
                 self.adb.run(['pull', '/data/local/tmp/' + filename, host_path])):
             self.adb.run(['shell', 'rm', '/data/local/tmp/' + filename])
             return True
-        logging.warning('failed to pull %s from device', device_path)
         return False
 
     def pull_kernel_symbols(self, file_path: Path):
diff --git a/doc/collect_etm_data_for_autofdo.md b/doc/collect_etm_data_for_autofdo.md
index 5313c4e..2c00101 100644
--- a/doc/collect_etm_data_for_autofdo.md
+++ b/doc/collect_etm_data_for_autofdo.md
@@ -157,6 +157,25 @@ Step 4: Use AutoFDO data to build optimized binary.
 ```sh
 (host) <AOSP>$ mkdir toolchain/pgo-profiles/sampling/
 (host) <AOSP>$ cp etm_test_loop.afdo toolchain/pgo-profiles/sampling/
+(host) <AOSP>$ vi toolchain/pgo-profiles/sampling/Android.bp
+# edit Android.bp to add a fdo_profile module
+# soong_namespace {}
+#
+# fdo_profile {
+#    name: "etm_test_loop_afdo",
+#    profile: ["etm_test_loop.afdo"],
+# }
+```
+
+`soong_namespace` is added to support fdo_profile modules with the same name
+
+In a product config mk file, update `PRODUCT_AFDO_PROFILES` with
+
+```make
+PRODUCT_AFDO_PROFILES += etm_test_loop://toolchain/pgo-profiles/sampling:etm_test_loop_afdo
+```
+
+```sh
 (host) <AOSP>$ vi system/extras/simpleperf/runtest/Android.bp
 # edit Android.bp to enable afdo for etm_test_loop.
 # cc_binary {
diff --git a/doc/jit_symbols.md b/doc/jit_symbols.md
index 27f87e5..e50d34f 100644
--- a/doc/jit_symbols.md
+++ b/doc/jit_symbols.md
@@ -44,6 +44,9 @@ For example:
 0x20002004 0x8 jit_symbol_three
 ```
 
+All characters after the symbol size and until the end of the line are parsed as the symbol name,
+with leading and trailing spaces removed. This means spaces are allowed in symbol names themselves.
+
 ### Known issues
 
 Current implementation gets confused if memory pages where JIT symbols reside are reused by mapping
diff --git a/gecko_profile_generator.py b/gecko_profile_generator.py
index 9fe9ad3..e7b0046 100755
--- a/gecko_profile_generator.py
+++ b/gecko_profile_generator.py
@@ -114,6 +114,13 @@ CATEGORIES = [
         "color": 'green',
         "subcategories": ['Other']
     },
+    {
+        "name": 'Off-CPU',
+        # Follow Brendan Gregg's Flamegraph convention: blue for off-CPU
+        # https://github.com/brendangregg/FlameGraph/blob/810687f180f3c4929b5d965f54817a5218c9d89b/flamegraph.pl#L470
+        "color": 'blue',
+        "subcategories": ['Other']
+    },
     # Not used by this exporter yet, but some Firefox Profiler code assumes
     # there is an 'Other' category by searching for a category with
     # color=grey, so include this.
@@ -122,6 +129,13 @@ CATEGORIES = [
         "color": 'grey',
         "subcategories": ['Other']
     },
+    {
+        "name": 'JIT',
+        # Follow Brendan Gregg's Flamegraph convention: green for Java/JIT
+        # https://github.com/brendangregg/FlameGraph/blob/810687f180f3c4929b5d965f54817a5218c9d89b/flamegraph.pl#L411
+        "color": 'green',
+        "subcategories": ['Other']
+    },
 ]
 
 
@@ -197,12 +211,23 @@ class Thread:
         # Heuristic: kernel code contains "kallsyms" as the library name.
         if "kallsyms" in frame_str or ".ko" in frame_str:
             category = 1
+            # Heuristic: empirically, off-CPU profiles mostly measure off-CPU
+            # time accounted to the linux kernel __schedule function, which
+            # handles blocking. This only works if we have kernel symbol
+            # (kallsyms) access though.  __schedule defined here:
+            # https://cs.android.com/android/kernel/superproject/+/common-android-mainline:common/kernel/sched/core.c;l=6593;drc=0c99414a07ddaa18d8eb4be90b551d2687cbde2f
+            if frame_str.startswith("__schedule "):
+                category = 5
         elif ".so" in frame_str:
             category = 2
         elif ".vdex" in frame_str:
             category = 3
         elif ".oat" in frame_str:
             category = 4
+        # "[JIT app cache]" is returned for JIT code here:
+        # https://cs.android.com/android/platform/superproject/+/master:system/extras/simpleperf/dso.cpp;l=551;drc=4d8137f55782cc1e8cc93e4694ba3a7159d9a2bc
+        elif "[JIT app cache]" in frame_str:
+            category = 7
 
         self.frameTable.append(Frame(
             string_id=string_id,
diff --git a/repo.prop b/repo.prop
index 4815a01..f158d03 100644
--- a/repo.prop
+++ b/repo.prop
@@ -1,113 +1,112 @@
-device/amlogic/yukawa 3d1928784cba4e2f957d34ed3ddebd739e07a70a
+device/amlogic/yukawa aff6ff49dd1e634bdb90d5a85f6e6d46b869e74d
 device/amlogic/yukawa-kernel eacb7f96b54ea6ce0ebb797ffdc9dbf3c99d4bd8
 device/common c7183550fa5b61f4941cce89f383fdf684d7d46a
-device/generic/arm64 a8f870b2bcc01d57753173ba88d82f450cf831fe
+device/generic/arm64 9fc8faea603797e9a3ebc04afbace2b0ddccfd99
 device/generic/armv7-a-neon a0ee1f09b316767ab6e655dcf670fcdf1da55ca9
 device/generic/art 29f98b9b6a81d5db6ebd4d926221df20f632fa3f
-device/generic/car 42eff4b00cf87cfe3eddb06c864d64f45cf4ee15
-device/generic/common 375c14b63313c3a22fc25f7a24a96492cac7bd66
-device/generic/goldfish f6a38fdb55b99a84ba6b7b39a0f952c8950aed03
-device/generic/goldfish-opengl ff37db2d0b6533f8811e021b8071eb6ccc8e9fc9
+device/generic/car 25caf775a24441e7e678160f793b109aa8e1fb6d
+device/generic/common ea788904d379866a88788e765356e2b3884a6c22
+device/generic/goldfish edfb1e472c527dd5d557a1f2437ea0b165a1eb68
+device/generic/goldfish-opengl cf32bd8e31e76c3d6f525c6401619bf445a2c64d
 device/generic/mini-emulator-arm64 a8c0896b7b861d7b88978c39b2ff2378cfab11d4
 device/generic/mini-emulator-armv7-a-neon e601f097400b954be840190789ea50ebec3d749d
 device/generic/mini-emulator-x86 d88a605514040a77cc5a90f8c48a963c652963b4
 device/generic/mini-emulator-x86_64 ad534dd78016dbdf78c7c2140ad606aca6d02568
 device/generic/opengl-transport a7a674b7500d644399e4875bcb750285369205d7
 device/generic/qemu 5ab1a80ca9a3edb54b8db53e20508f132aa9af8b
-device/generic/trusty 026ed1b0122e049444badb7f41d88e5f688ce9b1
-device/generic/uml 24427fa3ecb2835d2fc496a5622d63072011e0c7
-device/generic/vulkan-cereal eefd1c392ed8ff5aedd50abb89e9fbc729e114e1
+device/generic/trusty dab4e7e91209302ff5b2a38f33c80ec10e0af035
+device/generic/uml ccc81dbd8fcbfe5cb1780df714d286f2be58e35a
+device/generic/vulkan-cereal ff9d41f2fc940023ae1b49097931f1ac70312551
 device/generic/x86 817ed7bdaba24c0cf699236ba877858e7516acf6
-device/generic/x86_64 8c842b376a213920eb9eef147c0dc0c9e5563796
-device/google/atv 82962f8eebab8b11a2e2ef29265b91a3f7563ee4
-device/google/barbet 6b75f001c043365097508fb0d2dd6938cb1832da
+device/generic/x86_64 df183ceb2e0307409f50f43f53b22ddd4af1e1ff
+device/google/atv a0db11ae214193a1886c3bd37ac2afde43513bc8
+device/google/barbet af02f321e1ea5698610a790c0dce0ad200d6f10a
 device/google/barbet-sepolicy 165f0500a7d01d4ef32eda98b7e4eb8ee08a5f1d
-device/google/bluejay 1eeb92ab8ce7e0f403e9d2a0096e6383099998b6
-device/google/bluejay-kernel 68732734906b0c122806eaf416988f85ca492ad9
-device/google/bluejay-sepolicy 175be72af605b1329bb3338336d3f37f4c08074a
-device/google/bramble 4f7728a443282b350ae62257ea86a9968ad5b532
+device/google/bluejay 1896c248ec06746cae9d0748bebdcec85b78a108
+device/google/bluejay-kernel 1ec3b7fb104fc8d0064820685fe353d6b2f4cbd6
+device/google/bluejay-sepolicy 3b2d27961a1404e3adef20071c5f206ee1d11c0c
+device/google/bramble e94a2ac876a606609040392bfbb3830aedd34302
 device/google/bramble-sepolicy 5562cc56de314c101a53731eed772c4172c62254
 device/google/contexthub 15cd088f65687a89ee6d01da5c8327b78f5af8dd
-device/google/coral 6a0045e7b9a8f30dbb5bf80168ea0a0c085a8242
+device/google/coral 966838a43dc8fa30ee18e4693c774211f9e202cb
 device/google/coral-kernel 6a22401545aa828c318f45014133786d13fc2cb8
 device/google/coral-sepolicy 119f940b9326c813ff86266ac80d5bdfa70937d9
-device/google/cuttlefish 55de376959d68d6bee8f9f65dd78f4fdce1750ea
-device/google/cuttlefish_prebuilts dc150a79b227118b6e614713b2b7a136b70c280b
+device/google/cuttlefish 150a5856c586ac8165bc568b401ea8a31eac9b4a
+device/google/cuttlefish_prebuilts 7a2a5aa1a7adc945ddd142118b0cd2f4f568b8fa
 device/google/fuchsia 4deaf1f4a322e156aab73f51ea42caa812cb1771
-device/google/gs-common be5304cafa0757b7aaad734ef3a8c5dcbc74be09
-device/google/gs101 4c4dcad393f39cd327e6ef3113adb284d200ebce
-device/google/gs101-sepolicy f6fb6ad36ba0bbd658f3500d7290734e8635f1ed
-device/google/gs201 59063122a87747623fff9c7fa9fa0a83cfc9be78
-device/google/gs201-sepolicy 067ec20f889ab83cc1af1130608ff97321b6c0ff
-device/google/pantah ab2d8eb397f892d66e55839d966d1d338746d651
-device/google/pantah-kernel 8abe6f14c20f46196440efe1a34b9bcbdf9b8556
-device/google/pantah-sepolicy 0c6ce4ca0413a0d1ec3e0478c83abdf2fdffe952
-device/google/raviole cf29ff9b2b221532eec22a7e7692e9360ec27223
-device/google/raviole-kernel 46fc1b4337e7a0d8bc932848ed586d9cf3ac8321
-device/google/redbull f595539213cee4b44b2254b0ba091db6a04389b6
-device/google/redbull-kernel 9e64e94f2d58f09744a98de87dff1245c51a7a5f
-device/google/redbull-sepolicy a8fc5bc01abecea038a0da55cd8fc26d48c17a9e
-device/google/redfin 763ceea5c9b96616e205bcbabc9f96c36029d5cc
+device/google/gs-common 6ab5c1726a7e526d6aef3bb76dd991a72620eca5
+device/google/gs101 64e73056fd0af183d302b64cbd9177ae966b18d9
+device/google/gs101-sepolicy 7f1c7fed39ea17bb7f188e4ecf8c2f61d4b9f71d
+device/google/gs201 a9232132e6c5de2a049139660200ca24bbc0431c
+device/google/gs201-sepolicy 91e53a850a5c41626470316908e6c151d3cb4b8b
+device/google/pantah 294e3ab1d211f34a50fb027bd16bceab9812d19d
+device/google/pantah-kernel 28ae8d1125947037454e707c8104c9c6ae960dd9
+device/google/pantah-sepolicy 254e0658e667bbe8a74e661c1c059943f7f51d0a
+device/google/raviole f5dff59d1aba28d591f5c37813507016484af839
+device/google/raviole-kernel 444ceef3935338bf9355d298c925ca8f2614f461
+device/google/redbull 51268c79a688740dfc60d1c730f2423ee1f1bf0a
+device/google/redbull-kernel d05d24c1ccdd59a680e4686c575573b99978fbd7
+device/google/redbull-sepolicy fff662dab5d08ea00416910b1f47ca581b008db7
+device/google/redfin 2da3531fb1fa08baafe2e969d2cb39159ea88815
 device/google/redfin-sepolicy d7833be4c37508f262ef3e789da7db185c621d27
-device/google/sunfish 48602102d8c685665896fc7e743fb70eba9519d8
-device/google/sunfish-kernel 52bbc8ab8951d5b6df13f1c34fd6adce2509408f
+device/google/sunfish f35ddb437c022cb65f8829947110a04a1201b6da
+device/google/sunfish-kernel 1d08268fa174d99a2410b52be646462da5a3c2c0
 device/google/sunfish-sepolicy d9538db97d2abf956afeb4de8a7612022608e6ac
-device/google/trout 389b36915b97921b6183509532d15a9438b27fd8
+device/google/trout 2cb35d3c5a1908215401c5cb3fa35e26ae8b8bef
 device/google/vrservices 1dc8a3ac019079bbff315920970c7b2628c8ff8b
 device/google_car 9c8faceb89193bef5af369f631bb0af9aa91e851
-device/linaro/dragonboard 6a272eb2498239c16b1d57c36bfc419d28ed86cc
-device/linaro/dragonboard-kernel 1b73be6000529cc90b44cc01529a16b0236b3ff4
-device/linaro/hikey b288c71c877db1f7c4814e8271b280b9353c182b
+device/linaro/dragonboard 56876489ff9b9ed20667e4d84107852f35973515
+device/linaro/dragonboard-kernel 1139559c56b7bcfd579e95ef6d76cf65876fbfc8
+device/linaro/hikey 6df6212f808c17ffa20d76d674ddc48a8e003556
 device/linaro/hikey-kernel 37632c695e99b9a22af8f020f63321dad30d6411
-device/linaro/poplar 6a43016b1e40f56461bba0de0909c955805c8719
+device/linaro/poplar a27bc2154b6d5429829c645cfbe7cd94ec4aecdd
 device/linaro/poplar-kernel dc5a5f37e19871ed67bb9e9209e7318bb3e6ad31
-device/sample 9c11de233f6c5e6ff5bf621f38b0dd17e2a05f6b
-device/ti/beagle-x15 15d1aee6f12ca7edbd18f7919e0eb7eb671d9e20
-device/ti/beagle-x15-kernel 023a9a6074d4a76dfda2e81c1afd53aea69ac1bd
-kernel/configs 688fb59ac60f3a471948f74245082b74cb6c5db5
+device/sample 8dd3f12702d2036bc2a75904e44409d577801ef7
+kernel/configs 388b191c6727bfb2e733e2e585db883c2a64a250
 kernel/prebuilts/4.19/arm64 b38d60607f970e0e909748641514f0153c1aa33b
 kernel/prebuilts/5.10/arm64 c67dc0301e148d2d571b94c6a03f7e67106d4dd8
 kernel/prebuilts/5.10/x86-64 91b5e6a3892c7e825e4cc521a248fcd8dec81194
-kernel/prebuilts/5.15/arm64 05b32f931560cf9e55e5dc2e21f595c1fc301f84
-kernel/prebuilts/5.15/x86-64 77dbfe74ba0101aaffd8737a8186e24cc4e60594
+kernel/prebuilts/5.15/arm64 bc66344c193fa8602ecd82d4aadda0ce9d414e5b
+kernel/prebuilts/5.15/x86-64 a77bb4ed8fd3c678b7cf245fa520e79fe8ef8774
 kernel/prebuilts/5.4/arm64 c8c1e206427f3a6235bc644022b7b990d44a56e7
 kernel/prebuilts/5.4/x86-64 e73dc86a6807f743e2edbb4b794b5a91cb36c01f
-kernel/prebuilts/6.1/arm64 a7076a43665a7899818490ed1c19a7e15b0dd7a9
-kernel/prebuilts/6.1/x86-64 e604bab987dec6d4c437bd0a8478ff12f06f1120
+kernel/prebuilts/6.1/arm64 932a3c893ec8d8c68ef7c2bbbe5f3ad3fa1bf83d
+kernel/prebuilts/6.1/x86-64 d0ed33140eddaf1b809e4189cbce2d8702cb5faa
 kernel/prebuilts/common-modules/virtual-device/4.19/arm64 31fa2c2d74f8b3659d8a2093f727486c4d890540
 kernel/prebuilts/common-modules/virtual-device/4.19/x86-64 396ea43be7fdb2f7fa7f5ebf3e9aa2a3491a0e68
 kernel/prebuilts/common-modules/virtual-device/5.10/arm64 cd22e1bc9d0e9989f09bba672db829ebbeefb57f
 kernel/prebuilts/common-modules/virtual-device/5.10/x86-64 20630b3e5e31760c4e471b2b12931a5699573bf8
-kernel/prebuilts/common-modules/virtual-device/5.15/arm64 c68fb993196ffeee1b70b10c3da8e602d16d974e
-kernel/prebuilts/common-modules/virtual-device/5.15/x86-64 463ca7b8b8b1f6c179d47b8df79f40096a772925
+kernel/prebuilts/common-modules/virtual-device/5.15/arm64 2f97267178ba72d39e345c7649a4fbd1d4b24d05
+kernel/prebuilts/common-modules/virtual-device/5.15/x86-64 64fe67da1443baf5489494f3b61399ae6108b703
 kernel/prebuilts/common-modules/virtual-device/5.4/arm64 4f27972affa120ff4bf05d7b98c3d1ab738e1238
 kernel/prebuilts/common-modules/virtual-device/5.4/x86-64 19bb1957b2ed46e500386eafb79372891a2f4c30
-kernel/prebuilts/common-modules/virtual-device/6.1/arm64 71cb6267be041a0249b4c6d6f0e913e419f1db4e
-kernel/prebuilts/common-modules/virtual-device/6.1/x86-64 c430b0210a6f95cb17348275dff5823c23269025
-kernel/prebuilts/common-modules/virtual-device/mainline/arm64 7cb02fb6a88110bdcceb4acfd90104827edd2643
+kernel/prebuilts/common-modules/virtual-device/6.1/arm64 0d0e4ad631bcf311417b23f1aea9f313a7ddc1ac
+kernel/prebuilts/common-modules/virtual-device/6.1/x86-64 d8abbb9f922910ac12bddbab2cbbc16872780d88
+kernel/prebuilts/common-modules/virtual-device/mainline/arm64 e25bc08cc42b9ee51640ddcfcd765f8e8d88af8c
 kernel/prebuilts/common-modules/virtual-device/mainline/x86-64 12392d78b08bf7299d68e0f0709bb2bfc98027a1
-kernel/prebuilts/mainline/arm64 98243d4f9a8d64f1d43dd2570fc032021b2a5e6b
+kernel/prebuilts/mainline/arm64 a97a23ff92ae5a30d0c9be8360fa6b90a4dc4f11
 kernel/prebuilts/mainline/x86-64 989a3431eb6467c5364b0dab5ff0cba7814546c7
-kernel/tests a4aec14704baea29519538135c836f2bbbd88227
-platform/art ffcf66df66431b68b7fce3b3b91dd456d7d7e865
-platform/bionic ff309abeabc40fe7e5d5b0e77f79d7b939ea7648
+kernel/tests 759b10aeebb178f51ce41e0755f062b3e16ae536
+platform/art 7ea48e605f514c8dbdaeb6a0925dab881048537d
+platform/bionic 3f8ceef35aae9ae42d126af758c0993232bf8dff
 platform/bootable/libbootloader 7135682957015c1d2c5fb678e7a2223aac6a909c
-platform/bootable/recovery ead0017223e288331893b3cff4b67d449bcf87e6
-platform/build 87916727a3b1f0d3495bfd16fac9271e536e6b16
-platform/build/bazel 2b59ee496ee144e1ab313edf914378cf9ca807d1
-platform/build/bazel_common_rules aa197aff72c51d6f8a42dd5eec7a343a4a0db796
-platform/build/blueprint 1b8023f7d57da03e19ff44f6cec86beea998bcc6
-platform/build/orchestrator 631954eb9b9b3a648cf1481a86d5eedc76fb6737
+platform/bootable/recovery 0c47fd4e6a4f30c0caf11d23728c8b064f628305
+platform/build 367c613a054e90eac57b767bf01043d9724ada84
+platform/build/bazel 15bb67f6e0e84bcab5f6a9fc043c73a7dd190096
+platform/build/bazel_common_rules 0513e159301e7114b540df877d035319bef573af
+platform/build/blueprint 443e5b7bd2ccb8cb4ddc077cb44f72f5466595b0
+platform/build/orchestrator 2213bf7d0d488b687de79f3caec7c745ec145bd7
 platform/build/pesto 6980c20af488be1cab45cc3ec1d56ecc1c017523
-platform/build/soong d7c3e3b0780aa45f8c1f8f3dcdf254c772bae627
-platform/cts ce95123f93d5f6339220cb658987d0e5658c1030
+platform/build/release ebb33ad36c1ec88df61868ef26c98af44030ca6c
+platform/build/soong 635ce040e7386a8465f544894431438f2083db68
+platform/cts 149cff0dcbed1d70ea170e3e20a97ea51b3600d0
 platform/dalvik ba7d9699c17f44ec19be06476445b3c0517e1120
 platform/developers/build bf0f321f0a16d52d62ed3c499383609810845693
 platform/developers/demos 03814c35b8ee0a1284c667556260124d97466b28
 platform/developers/samples/android 3b699d3c85159a41aa6b34e4a7b9586d8721c973
-platform/development b5b1e6540a7f9774b5af53d61083da5af4f180a8
-platform/external/AFLplusplus f541b161a469a14aa6123346c9b74d92eacb3134
-platform/external/ComputeLibrary 1405801f50cd428018429491f77a6d4497c23aae
+platform/development e6d5c0bdb70e78ff0418e5a8ae46315ed512c97c
+platform/external/AFLplusplus 90bf771e688f5102d7eb049bdd0d7edbc2035d35
+platform/external/ComputeLibrary 6dfe4b623c55c443673afa0efc7a2c9f9cc82fcd
 platform/external/FP16 39b08a054a8c089a52ccc842e08cb3d7f487d7b4
 platform/external/FXdiv be60de4ee8d00068488e3bdf650feb8c2d6881a6
 platform/external/ImageMagick 1d10a2764b5ad9622e4d9ea9cd5c141112bf4ab1
@@ -116,13 +115,13 @@ platform/external/OpenCL-CTS c81f15bae0f7823225adce7882487120dd1654fb
 platform/external/OpenCSD ce999c96f812d258308d28ece9030593a07f7db2
 platform/external/TestParameterInjector 21e9dae08ccce536f7caf687697952338300fedc
 platform/external/XNNPACK 8ecb4af724de2cb6cee245c9056805c19642d2e7
-platform/external/aac 638dff52c9804c824bc8955e971321ebd7bc25c4
-platform/external/abseil-cpp 978ae57f3f60170b2e4611dbc325d81280e737b6
-platform/external/android-clat 0f12c7d2c5ea2ac52ce84ab83d499f3e0782f29b
-platform/external/android-key-attestation 9007698a5e550d8a97c8cde635b1ea943425b742
-platform/external/android-nn-driver 0562918257f1d9f7f8a9335d95aa8fea2d574ab0
+platform/external/aac e7499faa9c9678eb9586fbbab2c44e7e6c7f5ab1
+platform/external/abseil-cpp 4f515c1f2f9d32ad831a20c0bb979338a0b3e283
+platform/external/android-clat 79d5ad19f251a309a4ff72c33eedee4769d5e830
+platform/external/android-key-attestation 49398aec6d372e666dbd776b5d8e46a3c85c4bd6
+platform/external/android-nn-driver b7520d9a63bf19136dc9af85b67637ed6b145337
 platform/external/androidplot 9b8347467de2bda30fefd0c5b2428c4844f327f4
-platform/external/angle cb5df7724e70e1fd25a328dc3647fe799fe0cf82
+platform/external/angle b43226e4a9eb51e4c573ae79bb657ab8603273ac
 platform/external/ant-glob 95e51b66823c19140455380aed4cf49958f5a64d
 platform/external/antlr c4e29db728ee0bb93a6dbd2a9156cc8043b2f59c
 platform/external/apache-commons-bcel 29460e8058d5f5c44edc8c114816920416fb88bd
@@ -136,45 +135,47 @@ platform/external/apache-velocity-engine 4b2bb6fceef5181bafebf3601a7bd009984ffad
 platform/external/apache-xml 05be08f075097b602fc88fa417906a05b5711eb0
 platform/external/arm-neon-tests 502002a1ff353d56274d50181a04775934fae76c
 platform/external/arm-optimized-routines 6e84c212b2967378b32e0ca7fe09335e4f3e6a00
-platform/external/arm-trusted-firmware 79da9d3917d87179199e2f185d155da4e4ec1aaf
-platform/external/armnn a57a89ebdde238ffe235139659e35280f561da06
+platform/external/arm-trusted-firmware b3e9d7e48f3d3afcf896d0037aa3001c577c3a62
+platform/external/armnn 007037c23cf5294182bdc99d8fdfd60bd1dff9b4
 platform/external/auto e186883854cfe4eba6b33cea02af8b4a1f07aabb
 platform/external/autotest af85cc740f39e257c2970b8b076e5d4bcce96ff4
-platform/external/avb 7ea9f12462c0958e33af3696f08757d64d6d7518
+platform/external/avb a3baa438932aeb2036c385d46897c95ee51ac238
 platform/external/bazel-skylib bae1cb97912499c4bc24b52b7c8763d168f08417
-platform/external/bazelbuild-kotlin-rules ecb290b0b6680c622ddfb2233a1bf40069db9762
-platform/external/bazelbuild-rules_android 4aafad588d7a322456194dd61b79c2224d978338
-platform/external/bazelbuild-rules_license 40bd8edd39e2af737d05b7edac69fb8cd2ebd01e
-platform/external/bc aea1ec87638053e48b5a69b1483e1fad0b358c33
+platform/external/bazelbuild-kotlin-rules 360f3620e01b6774cec61dec482ca29404639edd
+platform/external/bazelbuild-rules_android 6884b2336d5c2239dfad697115f0c9dbb99d46f9
+platform/external/bazelbuild-rules_license 4e7e5e1fef8273b264cd694db9a2f337b7a88fbf
+platform/external/bazelbuild-rules_rust bf9e641ce336445e727bfec9baaac0bdb6875e32
+platform/external/bazelbuild-rules_testing b026ecd62bfa72d016706207fc8e494046c04b66
+platform/external/bc 7903bb6a267887ec8150c469d9e4672d47d78b4e
 platform/external/bcc 3b83459abe9e71408c569296b8641261364aa037
 platform/external/blktrace 9d58d5785c1502152923376b0a6c55c2c8c84509
-platform/external/boringssl eb2b7db1eb03603fe28b3a77ad93950ff2b71903
-platform/external/bouncycastle e5292d24572ab786b1fa6ae715b496305631ebd7
-platform/external/bpftool 6916d25e34ee04559485a0e015b57b3cc4f8ae7b
+platform/external/boringssl ab7a437ca978f59c6877f55c25de25b06f8a8cd9
+platform/external/bouncycastle 2f6f290c4a7a8802eb20e839ea3853b05a353804
+platform/external/bpftool 71b4529c7afc720836d27ed1b1166b19943f818b
 platform/external/brotli 40e33799fc26de17e67d72d1d4fad7cb47ea26d5
 platform/external/bsdiff 05387cc7d51b53fec51e70815f94d275824d4c82
 platform/external/bzip2 30c2054978ffd069996e994efa7d712a70bf42c2
 platform/external/caliper 656c0620986d1158467fce467f9fe2d64eca2658
 platform/external/capstone fd5fe7918ecec3000e35938e33b38b13d623946c
 platform/external/catch2 ebcd91591bb8a4d35299c77b8bce50b56945357b
-platform/external/cblas d525496a8dc559af6809ef04ff81db390ca2ddee
-platform/external/cbor-java 47b1250c4e8e17d5b4f6c23aa962966fd28f0bf8
+platform/external/cblas 489169135e73c7f2790b435f48469ab37f1d2ff5
+platform/external/cbor-java 923d0aa329c28f4dfe6c6bbbc14409dabe9a127c
 platform/external/chromium-trace 2967cc04a841af5b348bd9401f3210aa2f345a52
 platform/external/chromium-webview 081572c1bf7210d85bda2f6408c01d59a327f332
 platform/external/clang 37ed869361f7a7af068d4c9639691ed417c26226
-platform/external/cldr 513420a7429205cdef0436a549a1eedc247a495f
+platform/external/cldr e12dd09fecb43ed491329bca0dc62853a913b1cd
 platform/external/cn-cbor 550d411e7d57c8bd55720dfeb2e2cf36cb1863f1
-platform/external/compiler-rt 9f7e2c4488db5c84a5b50b6b525d4f695625dce9
+platform/external/compiler-rt 02bb7b6a923ef729d6d79bdffd3b2c44a31877ea
 platform/external/connectedappssdk 91ec3ddd08f146faf09c887e4b3f87bcd287e8ca
-platform/external/conscrypt c6e2a9d4b91cce13433466bdd8f1927b81c78895
-platform/external/cpu_features 623ac44c4ae58c52abb159ec5574ebd65931d015
+platform/external/conscrypt f0ec811b4f78044e5ae1e40befc34416eebe3f81
+platform/external/cpu_features 77c549da3fd07053b7855fb80623ccfacfaffe7d
 platform/external/cpuinfo 0aeee4bee5091a1801b1edc6ca790883540d5f9a
 platform/external/crcalc a2330584579e3a1de604c0d703491546a39861fe
-platform/external/cronet b47f7ec2d897a96c910ac30c61699ad3c3a2f289
-platform/external/crosvm fe0364b4c1e5835d9c65fbb6fa6d1f5908ba4dff
-platform/external/curl 0a1a66d4c190de06e28796d65ea6abc718ddca46
-platform/external/dagger2 c767bed2d07f0195464fd764422c94dadaca170a
-platform/external/deqp 75949b4788b5d86dcda7cd85fa493e58ab7ed5a8
+platform/external/cronet b17e1b825f1e4bd4b794f67dfa6d68af6c940b0d
+platform/external/crosvm abcf0aaaeab14d85d22f4d2df020fb88e95f80c0
+platform/external/curl 157adec0ff141cd560a0ac219671a997195ad726
+platform/external/dagger2 4151a3082c98e3649f9c5da89fead66508388e42
+platform/external/deqp d3278c1230c4a2d54f52f4d244c5c3665c4051b0
 platform/external/deqp-deps/SPIRV-Headers 08536495f8a964cbd80110952a0cc837527165e0
 platform/external/deqp-deps/SPIRV-Tools 1ad3d2195d74e1ec84f8c3533041dfb313b65b4b
 platform/external/deqp-deps/amber 2955282d3c2d3213fe11e5c93170b8c3ff7dfabd
@@ -183,36 +184,36 @@ platform/external/desugar da47960df7ac3d468b61e4aae9b79553f57b889a
 platform/external/dexmaker 931fd0644090f17f78935cd4af9101623ea3da05
 platform/external/dlmalloc bca4c256fdde629b82bc3220bc5df74df3378ac5
 platform/external/dng_sdk aea983095e7aacab5f8a9c350d19fdadbb72ca84
-platform/external/dnsmasq 982782e3fc85b182a03b463cc8aff32630c3d251
-platform/external/doclava 798034415d62679356d8b29e821f75b957fbb391
+platform/external/dnsmasq abb67195d044d60c7dc9fba042afef09f2a43daf
+platform/external/doclava a6dacff70dcd3e93632247dc18aeb78b3bfade06
 platform/external/dokka 95497905c9edf88295a1e62ea783501d5c9a534e
 platform/external/double-conversion a9e7a7201d16be4d5b6cc2f1499fd3cd396e9df2
 platform/external/downloader 7d424e59d16f4884dc60b4986f11d647bd75a664
 platform/external/drm_hwcomposer 4140e51b7f2c9f824b0f895a0c8bf9bc09e16b64
-platform/external/dtc 0cd033c7cf6b98164f8cd7f0a3909153af59462b
+platform/external/dtc 5f06b6a32817aba4c307af958b97ddf0fcf8148d
 platform/external/dynamic_depth 2d0f512acdf499fdf3d9fc26d4de46f20df0fd7e
-platform/external/e2fsprogs b1a495128918d56ff5f9ffb77b84b7de3af2b939
+platform/external/e2fsprogs 6531f77f3aa4d7789a60f32b9fc669b1d46270c3
 platform/external/easymock 78c20bdf92d5b8f4950f410d707dbc1cb3496612
 platform/external/eigen c406a11213b3b9ba8ad81e66281ed374e0c17dbd
 platform/external/elfutils 419368b972179181e2bea389afdbb9c5256e2f90
 platform/external/emma 8fdfe3edb6571867664fecb6c28eb74cc08aa349
-platform/external/erofs-utils 1f2baa3d1c13eda3793f437dd1168fe3b6630dcd
-platform/external/error_prone 0767ce7654ff97ebde1654c5ae20373c6beec4c9
+platform/external/erofs-utils 524f5a843b329a469c70ca317bdbd7bc2979295e
+platform/external/error_prone 15e68296f1b51f990f1030588843560d36621a12
 platform/external/escapevelocity 73e06735c7ee06982d6f2dfa7ab5bfae0b2d852c
 platform/external/ethtool 0cc11b75f3f5882cd62591d447b495e715bd5caa
 platform/external/exfatprogs a23c86b7d8dc0cce128d16904ca2604ee4985f1a
 platform/external/exoplayer 09b7658d86cdb7e00b6d8273556dacdaf7d8fe58
 platform/external/expat 98707562abdb4eb3ff9f59261bb6eaeaeadcd26b
-platform/external/f2fs-tools a7bf740b186199bb18b86022364ba16d9028df06
+platform/external/f2fs-tools 3a0397a62b6eefef66a90ce1fcbb88d50c379453
 platform/external/fastrpc 3065a7f78ba670bff8854a4f1c2e57e8a65ccab3
 platform/external/fdlibm 5b0dddd008a606e0bf9918615375760fffeb7d1a
 platform/external/fec a2c7619bac44104319a7af8897f793e4a4a3d4fb
 platform/external/fft2d 56d35e29b0ae513da2a0c646e13cf62c3824639e
 platform/external/firebase-messaging 3b50eee31a498f8e976cd665e9e27704c6641a83
-platform/external/flac 9624fcd6866b5fb554fd6ead78a61c42395657f1
+platform/external/flac ed2d0a885bb714c23d1d19522c6e01b99af7a5ea
 platform/external/flatbuffers b0761f39d1a3a1fac250348d67d785fdc6c53f9d
 platform/external/fmtlib 41b3958496f0aabc01bb9bb94ad8d6e452510e29
-platform/external/fonttools 7dc85e7bc1df5063b411431e1893d6bde4bdb93e
+platform/external/fonttools dc7cb226ced5d775beda247c7bf07870375376fd
 platform/external/freetype bb067abc13c30388f9d9f0183978c9f1094462b6
 platform/external/fsck_msdos bc06adce6ef1d72fc9513506334e1b02cc724748
 platform/external/fsverity-utils 372c4822512a1fd6a627ed2a397bb7740ed64db5
@@ -220,50 +221,51 @@ platform/external/gemmlowp 08f2325e053bbbf433bff49465d932301539efa2
 platform/external/geojson-jackson 3a1013e96df5be6b33fc90ba7d758bdd99ece91d
 platform/external/geonames bef4e3a0610d6a9e8b1f0abe605f7afc9bf6e4c4
 platform/external/gflags 28fa21d3a0b0b8f0b08e2f6798141044f399d33b
-platform/external/gfxstream-protocols 1fb35d1beb793ed3379930b61a7645668cb43f3b
+platform/external/gfxstream-protocols 54836a7b8009ffcbf2c4f215e2147bbbb97f24bd
 platform/external/giflib 1a06eb54ba65a37216ec265a47505c9891cca82c
 platform/external/glide 783bf3f7159668d379b64e6d0ce7ea319b5f3ad5
 platform/external/go-cmp 6251c118c21362a11f0ae011200e66ef1bff4867
 platform/external/golang-protobuf cdfa6a8b4120af1898f7d104f315b9b855e3a041
 platform/external/google-benchmark 59680164324b2a5690fe493f5ecf55807d3987a4
 platform/external/google-breakpad 7dad1adc1a87616cbd9f525351ec5eb93de2ba23
-platform/external/google-fonts/arbutus-slab 7d899c94b4c6db8fb21cdf50d9fe06c4ac167b4c
-platform/external/google-fonts/arvo 91173b4b6f34bb20a3011d5532d9cd52396491aa
-platform/external/google-fonts/barlow f8442e4aedbcf82a1144bb555dc712ea838e54f4
-platform/external/google-fonts/big-shoulders-text d5d942e16d327c4f85f2b22fd02f9fbb4f395658
-platform/external/google-fonts/carrois-gothic-sc 090bfbbd8b4c0c0595ad6cf609d3ed84cc660bc5
+platform/external/google-fonts/arbutus-slab 9422686257b372a3770429184558e2eabd5a3e7c
+platform/external/google-fonts/arvo a87be32a352de7d3700e09c21cc79961bdb0b556
+platform/external/google-fonts/barlow 59649814e202b4d368541cbae343d27287b3d410
+platform/external/google-fonts/big-shoulders-text 5997740bae12d28e372a7ef6e8acd52826b39c66
+platform/external/google-fonts/carrois-gothic-sc 08e50b3f69cea38f240e9516835305625e79baf7
 platform/external/google-fonts/coming-soon 40f3938a68d506c4de6842171a4c13cd74790ae3
-platform/external/google-fonts/cutive-mono 1ad8ff0958437998caa5e567d5917ca5aade3cb5
-platform/external/google-fonts/dancing-script a171e428817b333f1c294769974ae2fdbc468c0d
-platform/external/google-fonts/fraunces fe6f33c6f90d8693b23f96d240bf88130a1e95ff
-platform/external/google-fonts/karla 60a40a9df7bb375f2e7a81a8c82cf9bfd455e4e9
-platform/external/google-fonts/lato b6bcd2e9d9e8256809d7cf6a5adde6438fc6c752
-platform/external/google-fonts/lustria 0bd87a34c637d134828a9d1a97c5e1228d61d8c8
-platform/external/google-fonts/rubik e7d07af0772124a9f5ffc463f8d18bee13ee174a
-platform/external/google-fonts/source-sans-pro 9b92a072c16b22f8a4e9379ec20e9071d16683be
-platform/external/google-fonts/zilla-slab 5c6061004e275a7b37f44532b04e62e2c0f73167
+platform/external/google-fonts/cutive-mono e7d816e2bb655ce2f7f6d48e26effb7fecb3381f
+platform/external/google-fonts/dancing-script 5fcef866440d564b4bf78e90600e778fe6c0150b
+platform/external/google-fonts/fraunces 0592df63d12b099be2f5fd8a42519e0e2fa8d083
+platform/external/google-fonts/karla d4abb1a9a69ee87048b1f7adda0151cc74352021
+platform/external/google-fonts/lato 56effec18e5648f2923e2c2492a1796e1121e6e6
+platform/external/google-fonts/lustria 56b6cc5273faaa8f5c89e06a033575264406c41c
+platform/external/google-fonts/rubik d89b115b11973dc46c0f4507d729bc9be686e820
+platform/external/google-fonts/source-sans-pro 1c16490e2333f01779b97164833d8e5ff6b1ac32
+platform/external/google-fonts/zilla-slab 4ed2c175ba45be9392feefbb6ac30bf131cda61e
 platform/external/google-fruit 102ef33dbc86d485fb3a763e5135da673dea870e
 platform/external/google-java-format dc1e556bee08f9fb90e6836bdd929976b149da27
+platform/external/google-smali e29be1dceca347cea17710e897e2dfee69baa660
 platform/external/google-styleguide 839fa273f50bdda7830edee05e5f7fdaed4674d9
 platform/external/googletest c0c45077916618b8123e6c4ebc4681c531ee6467
 platform/external/gptfdisk 91edcc37d45d8cc0e9cb5ff4918b5ba2d5297a57
-platform/external/grpc-grpc 5281b87313c736fea76e3f1099e33204aba73d0b
-platform/external/grpc-grpc-java bb4cdbdb2c9a1d685a109e8a6dee71208027db98
+platform/external/grpc-grpc 2cf14cb981c1d86727225b53e7364c781805a4e3
+platform/external/grpc-grpc-java 1db904b649c830d19c5067376ec3d34f69fe06bd
 platform/external/gson 82f99c294e068abcbd1c7d08c516bf89925eae3b
-platform/external/guava 9324d56f67c46e40c0c5a9488e57ce734fb0f9e3
+platform/external/guava 2a20a6cdf4747bf0c429ef3232330b0f619f2654
 platform/external/guice ce6853c74b811c93ee46e48a89303b2dc9d4e228
-platform/external/gwp_asan 6e930f587fabc18bab0ee2fdf66e5496b2b04eb6
+platform/external/gwp_asan e6975cd7196930084748877b904d1e2693beff1b
 platform/external/hamcrest 200bdda8b151e01528c2c1fbdad255688645ea21
-platform/external/harfbuzz_ng 74bef5000c565642bb2ea0bcc5ec9333d8b72099
-platform/external/hyphenation-patterns 1894d30afe6e30418444740f3cca3a4f1803e7f8
-platform/external/icing af6d8e19ac4500ff2312a4543a8a2c993057cff0
-platform/external/icu 95c0d8cc97c43ff07499a8122b1b3b7edc741d09
+platform/external/harfbuzz_ng 79dbaab8d70db94458e08dcb1c7c2756398b89e6
+platform/external/hyphenation-patterns 7947bf55fc88cb87ceac553a8d7e77ee53358035
+platform/external/icing 423f41772fa7da1df2506450c34f4d0e2564d37b
+platform/external/icu 3a3805b7b3198c2e89d36a7194c40aed5a6f96ef
 platform/external/igt-gpu-tools 00276db4dfd26615183bf238d843f9288cae9e09
 platform/external/image_io 84a5e2e04d411e1bdbdd58f79c47517ed4f4f411
 platform/external/ims cd12ec284af301f28934a7a8ef23efe3cba3f10e
 platform/external/iperf3 d810f388faaa558fa12fedabcc08c02a4ce835fd
-platform/external/iproute2 e1c0934b082915b6993db3d5c52b674127de0acb
-platform/external/ipsec-tools 4d7d094e9a2e38448ca50697c14ee8790ffa4acf
+platform/external/iproute2 37efea05873c084801e36898b7229ec5435f60c8
+platform/external/ipsec-tools d4f7cfea4014e3d521be49715146586ea9b2fef5
 platform/external/iptables 043923390a5de839a7be64c2244bc57a40671b8b
 platform/external/iputils bd36e4131c289e7f1eefb5a271205be1896281dc
 platform/external/iw 792456395eff0ccf28817535032479b22847bc3a
@@ -271,14 +273,13 @@ platform/external/jackson-annotations b73fb394133048329b826e42accc351b0e73408d
 platform/external/jackson-core ea0d9ee74e9f7b9bbcf4c0fb3eb4967b922d3851
 platform/external/jackson-databind 7188a442a84aa75debd737c73e45f8e1a3186f45
 platform/external/jacoco b9679f0f715948c30985137f5652181f586a5e7e
-platform/external/jarjar 457ffe2a00d15228708d93bc286d293a726e7ec0
+platform/external/jarjar 9d0c2b650b8471b03e980437d7cafa0e9afe757c
 platform/external/javaparser 08faaaa44878ad0d7291654e6cae0a425a10c71c
 platform/external/javapoet 7d694e1d15d48ea8f1d0fb8fdf1ce70986a2b211
-platform/external/javasqlite 3af16293e07e4274c2af9916e7f48b6bed5dd311
+platform/external/javasqlite 3b7ca5019ca30b3cdbc2d66de3a0bd69eda4413e
 platform/external/javassist d5ef73633e83fb0f12da792629c9654f5de18899
 platform/external/jazzer-api 405ba82d392eb440d3c51e2f873a1e729ac183e2
 platform/external/jcommander 0ffc853ecc79ff1d22b33525174da5904a3fa12f
-platform/external/jdiff ea701cb502fd6c5b82334e7097abf7cd575634c9
 platform/external/jemalloc_new ae39186d99efe29e8773577fc35a36c49500bc23
 platform/external/jimfs 89ed7968263d45f6f90e41a57791b4884acc58e4
 platform/external/jline 1fa13171dc2b6621a8f1e6e0738c21f9815091ea
@@ -289,41 +290,42 @@ platform/external/jsr305 f0277ec4ca3fc2b36e12f3c987fe8abacb97111a
 platform/external/jsr330 7d984e42cacea0fa7ef69dcb84f8b2041d29e9d6
 platform/external/junit d2b1616cb539e6a0ca632eb0f96b5c2e408312e5
 platform/external/junit-params 03a5fe7c4e9cd89113638258f6fcce0a4193456b
-platform/external/kernel-headers 84f0ddcdd9841908ea2bdf9cbb3a1998a0b9a03c
+platform/external/kernel-headers 5b605638abbbcb2ba1dd9d86272bd67b366138d3
 platform/external/kmod be4f7e4175709fd0e1219bb8eb5aac13c4a76c00
-platform/external/kotlinc 4eb154d9a8b00971dbff71bf186bd7408ddc98bb
-platform/external/kotlinpoet cd8c6483505a52c79cd8db562df6285aefc1301e
+platform/external/kotlinc 918e0a089338ad7057faaf0f10638553913fe2ec
+platform/external/kotlinpoet e96f339184ad9c02dd003434b9a8e47f153da0a2
 platform/external/kotlinx.atomicfu a5cc21701c0a56ffc41a260aa8eca5259cb8b213
-platform/external/kotlinx.coroutines 99b6d41112a3ff144a04f80c1314d79953ed869b
-platform/external/kotlinx.metadata 8e60bf226d98554acc976e93d2c769d5f0b5af58
+platform/external/kotlinx.coroutines f3defcfa455f2d65e02f1ece043ffb1e3b9fa775
+platform/external/kotlinx.metadata 6899f576e8e98e87b6ba1a81771c35b89aef0539
 platform/external/ksoap2 19d275075332187277fe573372649104d173fdd8
+platform/external/ksp 4dd6e6c369488f4141217bfc900a9af9dbd094b0
 platform/external/ktfmt b6d3c4087a824cde7b2a0811478c7c6d9f6488c7
-platform/external/libabigail f932064b7353348213ab14825e57f740f3d28471
-platform/external/libaom acd2391d0e783d87786a35b3b4dbcfac79468a6f
-platform/external/libavc 69966a8600c166eb8c9ab97635c9bf11ddae3c81
+platform/external/libabigail 1252bc78ab413faaa23cae8ae06c031f95bfba0d
+platform/external/libaom a3c8f859b58297dbf68a61e849bca285e686d9cf
+platform/external/libavc 680993531005f344d324d84439c54a68d82706e2
 platform/external/libbackup 7650f0321fcd692ce63c46c0e2849f99dee63330
 platform/external/libbpf 955a3de1b95ec1777dd168f3ce78001a45f34fe7
 platform/external/libbrillo 53420514a426bc75b592969dd906a4e60b6b00e2
 platform/external/libcap c40671b04549f1ca7403788cc52a02f70d82f786
 platform/external/libcap-ng 61c4ba8efbccf1338f857846d4047aa96e87f774
-platform/external/libchrome 78214afefa5ec13bfc19edf08d613a7d798046aa
-platform/external/libchrome-gestures d8446b535828c4ca10aa0eb75ffefbbca2cde04c
+platform/external/libchrome 447fe55b8ed9a4db33b10322510d1234a707340a
+platform/external/libchrome-gestures 7d5c9f5a18144465effddd6acb747b517e583e81
 platform/external/libchromeos-rs b27975d123683186505d746bcf516f8bb469da82
 platform/external/libconfig 24d8529c70e48df31edfc397ef8cc417d9442d89
 platform/external/libcups 56ea9e7007a6cb10a809e4a42ca3201d9cda3a0e
-platform/external/libcxx 519016360f68d541ed83dc25596071de9ef656a8
+platform/external/libcxx 2c3e114a6caf46ae4c1686660ac0ba842c8f0c9a
 platform/external/libcxxabi 478d285a753fe385db5f70d447a5bca20f4b4bd5
 platform/external/libdivsufsort 46a0dc68594de255d2bc1f2fb1e933e959d77be4
 platform/external/libdrm 119b600e189cd4fb26ef3512b684338ff934c230
 platform/external/libepoxy 5750f73d618f0748118ed24048d11e4b9c726a1e
-platform/external/libese 4e34e07fba150fde463e65174bd3dfa42242e7c6
+platform/external/libese ff52b575894d01c35981ba12fe73b3bb80bdf5cf
 platform/external/libevent c315c9f34b37e5ae135a0b98bee83b3b6d30c68b
-platform/external/libexif 5aae61d99cd31167d303d1551f7915727e7597c4
-platform/external/libffi 1ee03ac50fa45d5d5cb935d81fff21fe3d191da1
-platform/external/libfuse 62c6c510a43c719916077f765f89355d5f939740
+platform/external/libexif 11ee67e45aa213bea2c04ab9374f1bda411bd9ae
+platform/external/libffi ec6fd7d2a5a8aa521fd02238f9893af347e41a20
+platform/external/libfuse ab5e2a6b374285665aad4dcba0136589f0256721
 platform/external/libgav1 09a2d3e2f711201046d2b3043b067382cb420365
 platform/external/libgsm 6b76088a1c58e924dd83f88193fac76743cc741c
-platform/external/libhevc 80fe874429a27a4c8d27e50ae725ff78a92ec32b
+platform/external/libhevc 8b040b4e20c49c982557bec255872e7fa1e3ec5d
 platform/external/libiio aa30157751eac3fc66bd8d3c05f671fe22173dd3
 platform/external/libjpeg-turbo 20f746f763f5b7d3fb0944b818404448f14b5071
 platform/external/libkmsxx 88d593da1959fb8b39bc8ddd3a3f817417d71db9
@@ -333,10 +335,10 @@ platform/external/libnetfilter_conntrack c793c5e9d06d0d99cdde0bf4b2ca93071b22cc5
 platform/external/libnfnetlink 36b2e95da1c45066635d4bd0d975deb129fc4dab
 platform/external/libnl 93561a06443ed558faa3c1fab5093b483b64ead3
 platform/external/libogg f577a4172a8e994e7490cea40f19dbbcdc2c9126
-platform/external/libopus f8c750c9b3b662663f2ad6148af2f9c2563913e6
-platform/external/libpalmrejection 2270a16340c8ea443ce6df056a04731bf5f67c94
+platform/external/libopus 4b8e7b2b8d10c92650cf7f0eb16c9831de03e240
+platform/external/libpalmrejection e1639e230cb908408465646a1f38e97ff55ac6d9
 platform/external/libpcap e4f14459800ae87ed5162d39b41ed224230606ee
-platform/external/libphonenumber 6c85a131fbf38801b07fbb73345853171e761d37
+platform/external/libphonenumber c6fb7492a2b889b41bfc0095eb9f3a5a5a5f8773
 platform/external/libpng a889a01ae5c1c3a942558a051409ecfe292f268d
 platform/external/libprotobuf-mutator 1f657e7b8ab2a95b3da744ca38875161804bf619
 platform/external/libsrtp2 99c0ae83c4556bf9ca3b867ee2906f59b7126c33
@@ -346,34 +348,34 @@ platform/external/libtracefs 0caa3f03e2d0f41763b51205b7248ea8974724f4
 platform/external/liburing 28bbf964fe4d6401c03f78f2295f4e8d24f35359
 platform/external/libusb 360583157bb9d8a11ce1d976cd9f4659db234e0a
 platform/external/libutf 6c4633be06e1ebe206150c4860f6424147968226
-platform/external/libvpx 812c65c1e717cb0d8e6d3db66970adf6a88390c6
+platform/external/libvpx 395fc6d14592e941c902d01168cd1f7ff61b68f4
 platform/external/libwebm 766f7044ba34b8803f220f9bc9dc65ec1738f6ab
 platform/external/libwebsockets cd9d0869aa6e1ff74bb1e0c25c991ba0d4f5264d
 platform/external/libxaac 0d6726e2c619c5f4663bc8f2f0bdf1d986a6d99d
 platform/external/libxkbcommon 863030e90cdfa7941048d1f14198997edeef52aa
-platform/external/libxml2 909d1a0f850686713bb697a9371af4343cd1f70d
+platform/external/libxml2 1ef9aff26edf623950b90b8b98293e7c2ea9ced4
 platform/external/libyuv 342ca3cb9ad9c6c6ef4423095566204886fc74cf
 platform/external/licenseclassifier 22bd2bd64d82495e023f1caf07a4755bce3e051b
-platform/external/linux-kselftest e9981602d9168f1930a982a4b317ffb7727f355a
+platform/external/linux-kselftest 8974a0c6a076e00e519534efe319c16ad9dd59a3
 platform/external/llvm ab882123de9e4db1cb2711c52a5d05d328675bc0
 platform/external/lmfit d4e2f0edbf898336a4a63c79d11e6d12e3f6bc02
 platform/external/lottie 6f78f71ec2bbdfa17c24438e2e64422c30f5cba6
-platform/external/ltp 9f72a8d3984e4b4037b9c409bfa78e714d4978d1
+platform/external/ltp b2caefc19cbc608963cb8e9084cbb4417c90f3bf
 platform/external/lua 8e889734456b175eae12b71202f9c7c98dd605d5
 platform/external/lz4 b36ff997a854c3dc575ea436f64dceb67fba892d
-platform/external/lzma 3d30ecb3935118d084c4a1457a8993785427a290
+platform/external/lzma dd3007da870a104644d705d080891f66b00e0cff
 platform/external/marisa-trie 3b71c518b6de4e7d1fc9a18f43ee29c5f0c76c19
 platform/external/markdown 59af2b2915a9e01fb627171e4d18e98d475da870
 platform/external/mbedtls d8a73fb88738415327d568f7d0e7ddeb11f4c319
 platform/external/mdnsresponder 4a91d6add457174dfec34c51c464b353795a836a
-platform/external/mesa3d d0d727ca0fb73320c133333350b10849650bf8be
+platform/external/mesa3d f3a981dfc3e14cddb15e5278ee250ed140d77dbd
 platform/external/mime-support d94f12474474d1c8f706238ed82385fbd2a58550
-platform/external/minigbm bdf79f9ef0047443af2b23406743ec5c0fe97c51
-platform/external/minijail b8eb61d61636145a05add058951f3fa357521c52
-platform/external/mksh 37fb955ddb3f0034d129fa2602dcf0c58b35d9ec
+platform/external/minigbm fdcf4a6ebd450c4acb36b57213c0e621009a2971
+platform/external/minijail 62ac21f351babe640d9be179dced9a2198b4ebb6
+platform/external/mksh ae3b95691c021a0db7a3b8764eff703e33d9509b
 platform/external/mobile-data-download abed6de63800f7a12aa237145296eb832271cba0
-platform/external/mobly-bundled-snippets c1eceebfff2f51e1696e079fc23f5e5128aaca0b
-platform/external/mobly-snippet-lib fa82c5c5d753f24ad3b25b5dba40d7dc1f1e1581
+platform/external/mobly-bundled-snippets 86e3de5e63ddae24157a7cc6d38d55215eb40e97
+platform/external/mobly-snippet-lib c7a44d12770c48da67437002c88de7e96ef4226f
 platform/external/mockftpserver 00aef00dad2bf2c21ab7a46e126477f0e9306b37
 platform/external/mockito e66cc35a0c13ce3bdfa3e84037e1f797ae3f3e1c
 platform/external/mockwebserver f6880ea05e1eb6e2a97951b71cbb061b3da07eb2
@@ -382,7 +384,7 @@ platform/external/mp4parser 5032af3e819cde7c17e44afe0b777427ef44cd4f
 platform/external/ms-tpm-20-ref d10b8593d5daa3ecc3b12cff3f1345b2746935c5
 platform/external/mtools e68e59e35367cd7f7dbcd270a7a1f4372ad0f90c
 platform/external/mtpd e4ec3907a94a22d915e87e329f6408d63abd672f
-platform/external/musl 855855312aef444ccac371ad3c767fd31e6c6355
+platform/external/musl 68fce39d23902f669c406946b045ded89f7ab1f3
 platform/external/nanohttpd cab514e09edbb16ace9755be70c39bb36976de8e
 platform/external/nanopb-c d3a0ba379949ab07d6e423228c4658666fe84163
 platform/external/naver-fonts be181d85b8b600bbc14fb65f6ec0d534f923dc44
@@ -392,51 +394,52 @@ platform/external/newfs_msdos f4768f3615dd1319fcc3f9df3e758035a7abaac2
 platform/external/nist-pkits dd749b463ff64f12fdb4606f8ea060e84b884573
 platform/external/nist-sip 5de9f9492658a836d5d4eb3a334550cd71976fb4
 platform/external/nos/host/generic d1dd2be988066256c482c4047fd5e6c08d93a6a0
-platform/external/noto-fonts 173914aa836955299827c6454a51955e6bfb955f
+platform/external/noto-fonts 1817c0d622ade1c9124563ff596c722aa25394c8
 platform/external/nullaway 35219a8e342cd985557ed49631ff2fa604a8c65c
 platform/external/oauth 09544024e174235981322fa7fbb7ac112cb399c7
 platform/external/obex 8db505c236be4ae377569620fbe728135ef118b7
 platform/external/objenesis 294f3f12abd305de1b3f7636f348ca2ac89b48f0
 platform/external/oboe 25410420eb7935d0b74ac9b6ab3b49b7ed55ff4d
 platform/external/obstack d7e4270c0b4f7af1462c4d4ea19c0997d636c67b
-platform/external/oj-libjdwp 7991dd558994b67f6a1724f0b997bee4513ad79e
+platform/external/oj-libjdwp 463ad0e90f2acc1ca9017b9fb0363d46a6da8865
 platform/external/okhttp 4902f2eea5acd69fb4f9ef6fdb2941fd1855932c
-platform/external/okhttp4 73ae9756098533a6fe58aa1149c88f5304f4124f
 platform/external/okio 8f68974e422dc505b63e3605e58d552b078c114b
 platform/external/one-true-awk 20b5e942ab5cc681c2594e18fefc875ef6bf445a
-platform/external/open-dice dcd30097aac85aaa62337ff05ce0f2a8928eff11
+platform/external/open-dice ff850688e2352bca2b9cf86c3e2c89c2ab31c491
 platform/external/opencensus-java 7ddb4e3d028c5af0b76a83fd7810d1c1df1d68dc
 platform/external/openscreen ac368af39b482940267745378a5e93d8b136d71e
-platform/external/openwrt-prebuilts 9626c0bf4534c388b2f7b4a8ad966fd13c8547cb
+platform/external/openthread fc4e726f127c20c7255bf25e25ad70ab8a812ef1
+platform/external/openwrt-prebuilts e57c7ef81af8ff64b5abf6fc368b4e9d1ee44dd0
 platform/external/oss-fuzz 45792028e46ab7cba95cedc05426af5b1ad4ca8b
-platform/external/ow2-asm 13b25b20d391079dd21ae93b70e38825e060a26c
+platform/external/ot-br-posix 30992be4796d010ed2cae90461f14b5f892fbe63
+platform/external/ow2-asm 170e568209e6b376d61434849875cb2ae6a55fc1
 platform/external/owasp/java-encoder d86fa4e886eda62c4718b24d0feff83868c72fb8
 platform/external/owasp/sanitizer 364933238830f2762654c4eb97bd543b890d1848
-platform/external/pandora/avatar 7468cdf7b8db3a0c59d767a62e36303b2b273abc
-platform/external/pandora/bt-test-interfaces 40fe3caa24e4bbb1a90782811f3248b74c15d8ad
+platform/external/pandora/avatar 8ed3e56beb30b5eb6ae7ae050f9f6dc016072049
+platform/external/pandora/bt-test-interfaces 91bbbe1727db1ad2aefc6442ffab40ab16b4af90
 platform/external/pandora/mmi2grpc 3201ccc3a472bb11ee69a0bc04a7a945baa7af2a
 platform/external/parameter-framework 45018f62fb6e7a7df64e558f8505cae7f6ac5121
 platform/external/pcre d5d48aeb62970e614682acddb2fc42fba74cdaaa
-platform/external/pdfium 400b68e7bc10286ff2f3276f157b5bdbd7a91b3d
-platform/external/perfetto ec1e25486e06b8f15be1f871b0b2720a22c47161
+platform/external/pdfium 394828854ac8e3907cafc281213b7da3293c90db
+platform/external/perfetto 12c4b8eaac15b128489ee7b11bae55ba42e47cf1
 platform/external/pffft 38c8fded9539a747d507ddf71a0c3ba24e4d654e
 platform/external/piex 737f9cbcec1da9b9068c5ed6dd755924586b76c9
 platform/external/pigweed 2553ce1e7154dfd24357bbf89057c7dfc621b3e9
 platform/external/ply 2b44d2d74803e6772274a4af1ea327a0b21eb2bb
-platform/external/ppp 1ad515d565dcb394d5bd5942be6e7090b6447f76
+platform/external/ppp a3793e01ff75db9c5b4a5f3125721636613d294c
 platform/external/proguard 26247a04689a6cb7778dc754e6decc98a5ef0b47
-platform/external/protobuf a3a81024fd963ae753f70acf75e08e989c84a1d3
+platform/external/protobuf e5993c74bb2c47fd2f39768c00f1874d332ae373
 platform/external/psimd ab055c4348c85d289d1c059b705cde6298be00fb
 platform/external/pthreadpool 9e7292856c65f1eff35ee8b98ceee49608e60e71
-platform/external/puffin 06e80242f732093881030c2d9b5eb245a09ca8e3
+platform/external/puffin 541a34c33efb2d702cb1a47c2d1e2c8aa2c71ef0
 platform/external/python/absl-py 4a8480615ea8b48dc6105bf54afc06fa60a3d1c1
 platform/external/python/apitools 70af3004ea8ecb16388f4941a49d966ff98f4c72
 platform/external/python/asn1crypto e83c340f1581821c44806f56a15fcd216c5afe85
-platform/external/python/bumble fde455227605cc0e46cb58f3dea3a07f13bcf71e
+platform/external/python/bumble c5ad7295257a46fb965cd8730b2bde2597bf62f0
 platform/external/python/cachetools 6fe7e081487c903e70dcd2c64250c11d74948410
 platform/external/python/cffi d75827f45a6e3f3616b56de1e62b3fb18f136e63
 platform/external/python/cpython2 6981db38a4d8f04e7d2e4b6a01348dc2e134f12d
-platform/external/python/cpython3 98c0fbae24505568ec588d5cdb9a0c9ce39c4f08
+platform/external/python/cpython3 bbb12d42e372c391e141058b8135e447de152ec7
 platform/external/python/cryptography 8a3e655da0ef5138eef77db77f4fb58bbabd9a33
 platform/external/python/dateutil f83b1fe336f3a6cc7efa24601f035ace8c13f183
 platform/external/python/enum34 b9fe1afc806c58824c3839d8d6ee7dd5802a6f69
@@ -446,13 +449,13 @@ platform/external/python/httplib2 f9af053feb605f51109db995673e68142cbac758
 platform/external/python/ipaddress 16d3099ddda36fdc42dcf6e47d98b26da57aad51
 platform/external/python/jinja 8661806ec50e1f3cddc61349051a6db5d3997901
 platform/external/python/markupsafe 765ae2b78e0fdbd4f98067408f206ef048e4f4bc
-platform/external/python/mobly 29f59855b4bd06bd4add011fae76098470206cc2
+platform/external/python/mobly 620060913d2e64c447af68c5dc6ed88a780856ee
 platform/external/python/oauth2client 5dbf1c7601275d7fed24804040a0afc9516eb377
 platform/external/python/parse_type b93b876f49258eac44901930950441a9df1c6de9
 platform/external/python/portpicker e56ee7f2b1e8fc1efd002841185963481760fe3a
 platform/external/python/pyasn1 daf33c63374f7c3fc9b1190b75a6f1aa04896031
 platform/external/python/pyasn1-modules d74ee479c54c8fc8db1f4bace0074b221b95349f
-platform/external/python/pybind11 7c44fa745d2d22a91fc1b5a060ec55858ea75321
+platform/external/python/pybind11 135d546d7b9876f2ab11f4f73e1619e067dda807
 platform/external/python/pycparser 9ce5b7bca62a956dfcaad781eea50eefcf0dac6d
 platform/external/python/pyee a8dfd1df7a01b0c0b212be3a3645ea26c73817d3
 platform/external/python/pyfakefs 808f2f24f9aed23176ccffa048fd7e00e04354b7
@@ -470,49 +473,50 @@ platform/external/renderscript-intrinsics-replacement-toolkit 14e47216cc12a521f7
 platform/external/replicaisland c25e445670c332d7ff4b16083f43d5c1af558e65
 platform/external/rmi4utils 1a61dea47dba9105522b16a5620ec2c41cc22a1d
 platform/external/rnnoise ddd1cce3c7649d9af848bafcfbfcb1818f03cf9b
-platform/external/robolectric 355b07606bb48bb457c7ac90992dc6aaf323eded
-platform/external/robolectric-shadows 88bda4e00754bed4baf23ccdcd3a5df0284cd837
-platform/external/roboto-fonts 2bcb10747d2b16ea57b65906b305c234bcec024e
+platform/external/robolectric e87e055168b519b7dab5031411a00cdd6a489cdf
+platform/external/robolectric-shadows 2574c825d8bcd4a312fd8142bdb1d2f005285cda
+platform/external/roboto-flex-fonts 513243b79171adf6e5070954c17fbfd7f22c6b62
+platform/external/roboto-fonts 91a155e2d35a4f2ac56e7410053372e5ddcf349e
 platform/external/rootdev a2d1e5b0999e543daa9a629f90a17a7eb022cee3
-platform/external/rust/crates/aarch64-paging b9f50b7bc45c63676229885abdabd42713ad2b48
+platform/external/rust/crates/aarch64-paging f11f2013c38f962623f1280ce655b97d1d7ebf19
 platform/external/rust/crates/ahash 224de831eaac1f84e0ec7675f4823d2af2c5ad3b
 platform/external/rust/crates/aho-corasick 2be0719db4725082cdb140d1561f043eb0de5253
 platform/external/rust/crates/android_log-sys 4d45cc46afe7d644ba9308704ebf842db7e380df
 platform/external/rust/crates/android_logger d6802dbfa0d0d1dc7c790e04b02702b8ec25bd78
-platform/external/rust/crates/anes 1026590d704a62274c7b5eb70c1e4f1e63f24ba2
+platform/external/rust/crates/anes 2a2e843074e1b3972f7a32353ed6a56a6cdda84f
 platform/external/rust/crates/anyhow 36e1910df1d38fa2e149cbf3019177d514322121
 platform/external/rust/crates/arbitrary 9bd19404ea5be0153c7d55678f5e64ab84564337
 platform/external/rust/crates/argh f6f93b9e5f45fb0e8dabb66a55e81e720e61c5da
-platform/external/rust/crates/argh_derive e8975f3de2f8a0bff21fd1c6117a636552a34eb4
+platform/external/rust/crates/argh_derive 9487584b3ff0fc3468f0a158827abc0215cc6d9b
 platform/external/rust/crates/argh_shared 15359dd9e0a686bdae4df09a98f015eeada9ae92
 platform/external/rust/crates/ash d82f167659345d066ef8b6d2751629d8dc7c083f
 platform/external/rust/crates/async-stream fb56ea68e07eb1c2ecd045d47feed3642e8d7e39
-platform/external/rust/crates/async-stream-impl a38ef5815c7540f99b8d0afba01f07a35a52e76c
+platform/external/rust/crates/async-stream-impl 5efddee89a916a80719cb971d73d1b9f2b0b9e11
 platform/external/rust/crates/async-task b72437f9e418576feae8fe1eb98d4d38a07bb7da
-platform/external/rust/crates/async-trait bf632b40ca24f83a14e986b0199959a54c853c60
-platform/external/rust/crates/atomic 3ba81121158e500340c214261b71809616ac7a18
+platform/external/rust/crates/async-trait 65ccbc880c5060f5e820ffcd39de43ebf046e937
+platform/external/rust/crates/atomic dc8c961e97a8ea06b2e9033f6ef31398b7050604
 platform/external/rust/crates/atty 1e81650d1ac8985812b14a4551b2629239c33cbd
 platform/external/rust/crates/base64 513725f30e195062759785d72305a50306f7b67c
 platform/external/rust/crates/bencher 9e2081b896d10bd20f30f01f11c79b2860ff6a29
-platform/external/rust/crates/bindgen 5a0018b5052a1ca5ebb96b411c7bb3ab0487e11d
-platform/external/rust/crates/bindgen-cli 3f6f9c291153050862b48bf2a2ccf054fd14c63e
-platform/external/rust/crates/bitflags 76a42615ab39bc48fb4f01560391d634cb48b061
+platform/external/rust/crates/bindgen 1236c67c5422199e2794238b3dc616db46a69f5a
+platform/external/rust/crates/bindgen-cli f0ff38ca24ed12e66a23ae93e94118070e261007
+platform/external/rust/crates/bitflags a8a7eb92aeafc78d096ff7994cfc504ea865e6dd
 platform/external/rust/crates/bitreader eef524ed280689478ef7ae099f8f88ad40b6ab1e
 platform/external/rust/crates/bstr 3334c8f15f7626f63e12520046ea7213afc5269e
-platform/external/rust/crates/buddy_system_allocator 4d07bb02ead354a8adca8f5a90ac39d7c9290ef8
-platform/external/rust/crates/byteorder 19d8a7c2ddf63ebc6bf2c05fb7eb39e278deca91
+platform/external/rust/crates/buddy_system_allocator ece9fca7166ea66462fa47392fd5f1626802ae21
+platform/external/rust/crates/byteorder d7b079d199d974efc2873a1d9b3f3ef6c04d1e84
 platform/external/rust/crates/bytes 226f0bf87de01963ce426346a1451c622fff48f4
 platform/external/rust/crates/cast d6ba80ea6ab86961da0f03b430974d85751b14c4
 platform/external/rust/crates/cesu8 c6c0f0fe3369dad8127a51c2ff6d7fa28db6a9a4
 platform/external/rust/crates/cexpr 7456c152c309e17ca5dee80737efcb38749ab098
 platform/external/rust/crates/cfg-if d5bdf5bb3358e9064b2693aab583c021be94f036
-platform/external/rust/crates/chrono d1c2687b72c66144e98332ba02c5e34163e4a80a
-platform/external/rust/crates/ciborium b0f256cd99c102e46b30ffe3db7dd492ebad593b
-platform/external/rust/crates/ciborium-io 43a3a1994a76abc0dcbb3dbc29da6630cd5c1c5d
-platform/external/rust/crates/ciborium-ll 18bb9b7f5163ef9c984003c33e8d79f53c7e14f4
+platform/external/rust/crates/chrono 30b250003cfb7d3cba04316e5bd544c78d5ee04b
+platform/external/rust/crates/ciborium cd52c63c2448fc64ed013940fb9d2d94202f59e8
+platform/external/rust/crates/ciborium-io f18a0d01e88ab0da55e5e483dcd462b4faa7c354
+platform/external/rust/crates/ciborium-ll e84961cd2e83e1aec62f2564734215b53fd3c28d
 platform/external/rust/crates/clang-sys 1a5961dc466b74729ab0c5711561fd1b536de8c4
-platform/external/rust/crates/clap 7fa5b088f6c1968638864507512d1d08d335de48
-platform/external/rust/crates/clap_derive 7f4481ffeaac95e2fe409cf872b22cbcebda8def
+platform/external/rust/crates/clap f390d6a30adc4455dc701c942358575db748ad18
+platform/external/rust/crates/clap_derive e9fa046d037166b3200f856616060cc190d78c73
 platform/external/rust/crates/clap_lex e7f039fd13d46dbddc02fd1357c102b41fb19649
 platform/external/rust/crates/codespan-reporting 278644c7ed0cda2f14a33e713089b984311df681
 platform/external/rust/crates/combine c7fa5ca778073f69f35bfe0a8bbbab55989b8193
@@ -532,13 +536,13 @@ platform/external/rust/crates/csv-core 6649413ada80734e51f2c4967986a0afafd535a1
 platform/external/rust/crates/der 7790f8408e4893ce3c595a52e203cc1eee0e9b7e
 platform/external/rust/crates/der-oid-macro fb2e85f6e31911978cd6f2b9f584970ef538445a
 platform/external/rust/crates/der-parser d3b2f45fa2c2fb560a45a21b9f73f4a4dba8401e
-platform/external/rust/crates/der_derive 72bc9c5285c5f9517c68a2b4d2ac2f7c7435a09e
-platform/external/rust/crates/derive-getters 3eecc2d93fb1ec3c75d5cf2cd6ddd99a80cc1306
-platform/external/rust/crates/derive_arbitrary eebdf4fe508c2182f453da9215fb24fc2be4930a
+platform/external/rust/crates/der_derive 9d16e0dae0137623cb4d9177e4d39a2108f5fc50
+platform/external/rust/crates/derive-getters 510761ba2dcd4e18cfc4296763300ac0d402792f
+platform/external/rust/crates/derive_arbitrary 5a0318fc19ec525f3ade7c4ff16af315d209b26c
 platform/external/rust/crates/document-features 5783ab57a3e376670f0639f210a076f9cc4cf8b6
 platform/external/rust/crates/downcast-rs 6c669365fc3dc3f4016297bd01b5e24c0f4161e9
 platform/external/rust/crates/either 0263b767bba5ab17df25785ac88a19ae8c7af80f
-platform/external/rust/crates/enumn 8714d2d5892eca3cf10a972ffe9e841c7e419112
+platform/external/rust/crates/enumn 506612e5134ca93954aee356c97518049cf93f82
 platform/external/rust/crates/env_logger 76eefd181faae28faa75c7ded4c681d69a187975
 platform/external/rust/crates/fallible-iterator 46fe24fa521969a10f504eb8f5b8add2ede2e1c1
 platform/external/rust/crates/fallible-streaming-iterator 5ffea6b8b4efbd7e46f849756799e645b1dd4025
@@ -554,21 +558,21 @@ platform/external/rust/crates/futures-channel 5aceb3f51fd5044657cafa68c67cc84588
 platform/external/rust/crates/futures-core 01183c9f7b4b181ddfd270670a1b6bde3cc5a44c
 platform/external/rust/crates/futures-executor 1c7ce7e0b814012f38688cf3ad38f039e3a246b6
 platform/external/rust/crates/futures-io 3ad48cfca4fd7b61e51d4d906a80bf2d1668315e
-platform/external/rust/crates/futures-macro cf07d598a435c87ce0c105526dc10b5a421797bb
+platform/external/rust/crates/futures-macro ca95599a516beb8bc9c5519b2ee650ccd310796a
 platform/external/rust/crates/futures-sink 1f9cb4623cd7d5e45c8bd8c4e5c65ccf4284b0ca
 platform/external/rust/crates/futures-task ba22a03c13b5a32f8b2e77f95b3bb1c206883632
 platform/external/rust/crates/futures-test 6683f03ec7253540655cfe961b3e1e5e299aad2a
 platform/external/rust/crates/futures-util 17cb0f3372499438b216afaa57b3f98c93ded5f9
 platform/external/rust/crates/fxhash 7df515983e443b54de83ae2b3160fda1bb109ea0
-platform/external/rust/crates/gdbstub eeda11d36d5febce136c1cc8ae402d752967096a
+platform/external/rust/crates/gdbstub 140567aa378ced0b5033340454420c20d285119a
 platform/external/rust/crates/gdbstub_arch 2119b90d84fd5ba9e5e2585f0093a7ee5ad05901
 platform/external/rust/crates/getrandom ac85b6dfef2dc856bc4eb99fc6bd17f358838c97
 platform/external/rust/crates/glam 36361c0ba5a918a1ad73da801c79007bae29fb64
 platform/external/rust/crates/glob 86b160e897ba53e1848601068000281a370c70b0
-platform/external/rust/crates/grpcio 3baa9f2dae8a40e689222e0a95adb0a5f7685337
-platform/external/rust/crates/grpcio-compiler 37eb4729e7d150965c25501d091260ee6df2bfd0
+platform/external/rust/crates/grpcio 2095a29af83f3d3a8e73943222610897f4e5307d
+platform/external/rust/crates/grpcio-compiler 970fc57dba3d1d14f207f0637a5e5142100f6bd1
 platform/external/rust/crates/grpcio-sys f1cbc7727b4092b23973ab70190d456d4f6b9a9e
-platform/external/rust/crates/half 251c6d4ccfba08c43cd597e0164fb8010397815a
+platform/external/rust/crates/half 3ab0967e9fd6e44463df0ba4d42baa57a1774d7f
 platform/external/rust/crates/hashbrown 714bc3fac3089cc1a00286c8decc46803022ee98
 platform/external/rust/crates/hashlink 0f58b240318d0bbdfcc866c1d1f28de9b31a943c
 platform/external/rust/crates/heck 503488fb197c71fe686fd22ff6fbbff814601b86
@@ -584,52 +588,56 @@ platform/external/rust/crates/jni-sys 71320a468b3ee4f8a7f60f2be16c2d828f5a83a3
 platform/external/rust/crates/kernlog f772f1674f2be288f8a57fa738b1398d80fccbf8
 platform/external/rust/crates/lazy_static 5f5d21d8642eef506e90bf7797f6ade00572c451
 platform/external/rust/crates/lazycell f058703540912042a34050bbea7d9db140d3f8e6
-platform/external/rust/crates/libc bcb23b6b7a1f9487a501dc8cee30168c793615cd
+platform/external/rust/crates/libc 9813db771ebbdb81ccdfff89b726eaed12928b25
 platform/external/rust/crates/libfuzzer-sys 5598687ea707beb925bde07606afdd84a9bce9ca
 platform/external/rust/crates/libloading e3e14fa5e1cc55bd1fa8e794e57e7553d6486821
 platform/external/rust/crates/libm 5cc613e153a16dc0263b01094d843c8721224c5f
-platform/external/rust/crates/libsqlite3-sys f817767a9dd6364736791719002c988825c12f6e
-platform/external/rust/crates/libtest-mimic 5fb38dd8ad881e6d177fa38be6bb303604d55609
+platform/external/rust/crates/libsqlite3-sys 7e1bea98726e13a936af960de9f6286eac55a9de
+platform/external/rust/crates/libtest-mimic b14e3d79e6d89d95939a46a0288051d559fe831a
 platform/external/rust/crates/libz-sys 4b1ce8cd54d728288121e1dab5dc5e1d60572337
 platform/external/rust/crates/linked-hash-map 22b72a651823c59487707c098f4845825faaf616
+platform/external/rust/crates/linkme 6bb78b04828ad5e139515de7d47b59adb37d0205
+platform/external/rust/crates/linkme-impl 9a4eb57280464a2f11b36291112dea3466b5f6c0
 platform/external/rust/crates/litrs 4e10cb2e37a6aa8d9b27f77d93c6a18bf54d0130
 platform/external/rust/crates/lock_api 81c651eb5aa1dbe5914133a92ef8fb1bae78b812
-platform/external/rust/crates/log 98397baea7e0eaa30c5285a4192e5b45557edc4b
+platform/external/rust/crates/log 3f931d96f762566f8518dd5694d83e5e1769906b
 platform/external/rust/crates/lru-cache 6f6428526bedb5397fa4cd29f48610f03d7dc661
 platform/external/rust/crates/macaddr e58d97ef7698a95667ad411c3e03f8cbefd0c074
 platform/external/rust/crates/managed a5d4c6595fa1ed1eb6c0af23766821dc709b8e87
 platform/external/rust/crates/memchr d2b2dded2423fff303e91be2a49444134b0ca35f
-platform/external/rust/crates/memoffset be1aec54ae0e4e923b3111a8000d57b27f432558
+platform/external/rust/crates/memoffset 3d2a54cf65c925f06b7c88d61eefa26803f8e03e
 platform/external/rust/crates/merge 443e883a0d47d9b1e42e6fd8b9456d1b9e04a5d3
-platform/external/rust/crates/merge_derive 9115799445a1cba9b67b56d6388f5abeae25185d
+platform/external/rust/crates/merge_derive 68eeabad4045a328c6b1e7f686c07cfbf68a09fa
 platform/external/rust/crates/minimal-lexical 5aff5bcb76ee33c158f28fe518cb9649581954e7
 platform/external/rust/crates/mio 9dfdfd066edf2d8efe7ca63a423a5c04b44d03aa
-platform/external/rust/crates/nix c342ceab6d8637f3421e00d264fbf98ac3fbdb5b
-platform/external/rust/crates/no-panic 334081005dc70dd50ef360046d75bc91a0fb9c99
+platform/external/rust/crates/named-lock aaea0878178334718dc55fd3745c0f8a538a43af
+platform/external/rust/crates/nix 29794d18075a924cac8dde07b709052f9326498c
+platform/external/rust/crates/no-panic 2e5c79c859c7fdbdea30d82069c89d7c493322e7
 platform/external/rust/crates/nom 23405602c0ec8b36aeb3180ff450b22053b79c97
 platform/external/rust/crates/num-bigint 8f08322410af39e0e3e854694c49850106927b2c
-platform/external/rust/crates/num-derive ef880c2a91127846cb9edeff44bcdf1c1d5ad2f6
+platform/external/rust/crates/num-derive 94fde162af23d33f08142caf6b43130f72280b64
 platform/external/rust/crates/num-integer 42ba40350a7e074165b2ac0774e39ed2cd1ce08e
 platform/external/rust/crates/num-traits bc639f624877d90bffa38b96e9c7262004993b22
 platform/external/rust/crates/num_cpus f5e36fb5387721848f3106b1c53eccd58455b5ef
 platform/external/rust/crates/octets 2b5b138f8e584b9672044adc3f40d46f2f8b2324
 platform/external/rust/crates/oid-registry a316eb2878645a9c4473425cc7d9be434b7baf81
-platform/external/rust/crates/once_cell 6b626176123050120d67172ee1f0b9d1c376b80a
+platform/external/rust/crates/once_cell cdfaf9d9f413e434868ae2879089d8bb20a0f384
 platform/external/rust/crates/oorandom ea68dd5a3e1be1aea60a88b914e8d8c10881fe51
-platform/external/rust/crates/openssl dc0d7bb3fb3f5d12743199c547df6c9a5130ef9c
+platform/external/rust/crates/openssl b5b0e775beb1849cc9bee56e4e98f5a6a41a3973
 platform/external/rust/crates/openssl-macros 235dedb203c2e394e3b533757ba65da645510f82
 platform/external/rust/crates/os_str_bytes 0dbb8008b5e2a27dc5ec7f3acd80f248d5c88c69
 platform/external/rust/crates/parking_lot d2f69a0957fd63c04eef88223663543aab7d13f2
 platform/external/rust/crates/parking_lot_core 37877a963beade463c2822a540fbe94329749ffe
 platform/external/rust/crates/paste cea16d9e49b27b502cd792d6e364ced0a5ca105a
+platform/external/rust/crates/pdl-compiler db9fffe8304d4c6c59b5695c1394495d8c3290e5
 platform/external/rust/crates/peeking_take_while 37d0fc97b0660cd248e001f227577b68cd6fde8f
 platform/external/rust/crates/percent-encoding a80f927abf4ac30ad547959d361a516ae5b63133
-platform/external/rust/crates/pest fbdfea677a5f337dd280bd1ad047943d94469f87
+platform/external/rust/crates/pest 7459f53b8a087861c97ad916574b1ffe079a61f9
 platform/external/rust/crates/pest_derive 7e3a5eddfba82050bb15916b58dc0410df256004
-platform/external/rust/crates/pest_generator 6cdcf4f7e0e4dc8bc877b0d6ef1ad3b79c59273a
+platform/external/rust/crates/pest_generator cf6d1e8ca6697281fedb9c2291a0feda112feb21
 platform/external/rust/crates/pest_meta daa929ffce565ef7e7cad5bddf690d3801bfc023
 platform/external/rust/crates/pin-project 3bcbef2958c3403cbc75e071f777d9b54bc01dfb
-platform/external/rust/crates/pin-project-internal 846bef23f65c8b5a327b15cc9a17c494d25c7388
+platform/external/rust/crates/pin-project-internal a0c48f90aa07fb8ca57e5508897f76304d4f96ec
 platform/external/rust/crates/pin-project-lite 5564e14e3ff9e0661d2bfd37e21d25d78a8bd0fb
 platform/external/rust/crates/pin-utils 0308e83a1a5e274e80239b4887ef07bf60fbae50
 platform/external/rust/crates/pkcs1 790b8af13d2da3fd9c797488122c1a2a1b8f96e2
@@ -638,239 +646,248 @@ platform/external/rust/crates/plotters 564c16343538a0ba36c7ca4c80e8189d2669ae8d
 platform/external/rust/crates/plotters-backend 2e1d769c5a089ab0cff040488f7c8227d782abb0
 platform/external/rust/crates/plotters-svg e7c4f6d4e67fae7e1712cf9347e9af78cfee9d8e
 platform/external/rust/crates/ppv-lite86 222f742a78bc01926c77df0360244acdde894d4f
+platform/external/rust/crates/prettyplease ee6cb37112f18c4a56548c628e9c44925980c728
 platform/external/rust/crates/proc-macro-error 794c97acf88057ab91fe02e6f532b0ee85b14d57
 platform/external/rust/crates/proc-macro-error-attr 43ac89266c75437654b946e407d1810da33cecaf
 platform/external/rust/crates/proc-macro-nested 0a3dd241a21d624a596f5f4c965ab85864cd38a7
-platform/external/rust/crates/proc-macro2 8c17326962820b1c8a1355aa41627801f87efcd6
-platform/external/rust/crates/protobuf b359c6a24c5e955ba98ede214ae253a5acf732df
-platform/external/rust/crates/protobuf-codegen 555b148eafb040587b2da3fca77992b7c7c0d3e1
-platform/external/rust/crates/protobuf-parse ba3fbb8de31d869a7c46ab26aadef3a3b9a56827
-platform/external/rust/crates/protobuf-support ae3bfb6e232d7c8753c197e2bf4c24d73537dca1
-platform/external/rust/crates/psci aef5d8343c52d1dfb9515d777ae653c32c885b5f
-platform/external/rust/crates/quiche 7ace20c5b337a3b0c4cca777db1942dba88ea70f
+platform/external/rust/crates/proc-macro2 aa852e4f449b2892c7d8babb05f41dbded71a48f
+platform/external/rust/crates/protobuf c0601cad156361daf0b3bcf4b03aa0329239d660
+platform/external/rust/crates/protobuf-codegen 90e3f9dc2b7dfb456d8a06f2161a2c6986374e4d
+platform/external/rust/crates/protobuf-json-mapping 8f32a2b18c0161f4c03202a417d0893793e98058
+platform/external/rust/crates/protobuf-parse 540af3d647e7d0d96b16b85617abb7490944c58e
+platform/external/rust/crates/protobuf-support 74e4a9c9ba5cdc7b91c9706cc8eea232117a7e6a
+platform/external/rust/crates/psci 9aa6021dd61b6375dd6b21130e4167f4b6e1e101
+platform/external/rust/crates/quiche 0dada445bd622614458f732b3c7536e629fd9911
 platform/external/rust/crates/quickcheck 984eb86f26e45ef3d3bfd9c9d343d5d590c078b9
-platform/external/rust/crates/quote faf35617b12d279d4ff3bb17c8970cf74142b84e
+platform/external/rust/crates/quote 48705d7d6bcca249e4fd16b0bd2eecf3ba3a7cd6
 platform/external/rust/crates/rand 7f968c72caf3e12a849dbf3b9ec6f087c3befb36
 platform/external/rust/crates/rand_chacha 02fd71440ad20d9ca7a5af0b1024a41149354e4d
 platform/external/rust/crates/rand_core 9ddad9a79b5ae5814f3fd5cfcdf73668507d4fa1
 platform/external/rust/crates/rand_xorshift 940d1c10981deab1c569f09ea6553ea72df3d252
-platform/external/rust/crates/rayon 9a4e2d5fa6b6a366ebb9690d2dacad29baf3b569
-platform/external/rust/crates/rayon-core ef2d76b5af40b73734766fe05e0f7b1f383de3b3
-platform/external/rust/crates/regex 0b570678289f8b4470554da58037e615d348cccc
+platform/external/rust/crates/rayon bea825bf1f9f0a554a3e7fcccefe9760ba79df28
+platform/external/rust/crates/rayon-core 6bd21e0481a0b29761c508bff2ad959f40d2d51c
+platform/external/rust/crates/regex 0ceeaedce3f9cb53745213df5ca6b47ad32ae206
 platform/external/rust/crates/regex-automata 1e736ca510af445b8f4a4f059362da3aa55e4a95
-platform/external/rust/crates/regex-syntax a926bb621db9a1ead10dbb436fd7926bb297a296
-platform/external/rust/crates/remain 24a941d3229ebe148aa6b2e55e152558579f4457
-platform/external/rust/crates/remove_dir_all 2a5de32720529e836f2ac62cca806cfe11b4cbd4
+platform/external/rust/crates/regex-syntax aff191761c782b2ca5b4b1d8ef3735a9ec456bbc
+platform/external/rust/crates/remain e4df91b721a5394f38d62da47c76bfb8d078de81
+platform/external/rust/crates/remove_dir_all 0a97238e1abf6e1684422a4b9fe964e406ace5e2
 platform/external/rust/crates/ring 511a199b62ddab438cc4fbf563239e5f4284730e
-platform/external/rust/crates/rusqlite b5556e1c9a5a59b4a45c8d88de58dc1405a900dc
-platform/external/rust/crates/rustc-demangle 33a197f32916f04fd0aaae8a392974340e27f7d5
+platform/external/rust/crates/rusqlite f42ceaf199d817e1caf872c0fc7f4d57ea42ed52
+platform/external/rust/crates/rustc-demangle 0949da30757830c488c2391572c79d94e1a69aac
 platform/external/rust/crates/rustc-demangle-capi 17a52580b85f55518c4a33755e1ddf04d4f2ca2b
 platform/external/rust/crates/rustc-hash 6cf30a9c221696bde370304abcf530c85ab9fc03
 platform/external/rust/crates/rusticata-macros ce1a302416468bd35d9f7bc560c8adbd498f46b0
-platform/external/rust/crates/rustversion 8e373c6c14db8662f322e92c1dbf8845b1a8aa20
-platform/external/rust/crates/ryu d68e0597a2858314a08d1df01f6d78727bd10bbf
+platform/external/rust/crates/rustversion 06e910c071dcca5f2f1b0ae13945aad8c7871a18
+platform/external/rust/crates/ryu 0bf6802990ab03d98269977d3d321e888ec50831
 platform/external/rust/crates/same-file 715eec2c158a7eda741eb11e363704a5aa0a91d6
 platform/external/rust/crates/scopeguard 38a7fbe4b038aaf15f349e75475b83acc61d0457
 platform/external/rust/crates/sec1 09799a8406ba35d48be1c5d5c0da150acb040ad1
-platform/external/rust/crates/semver 06cf52ad123d66e05e21688ca13ed4a27b654776
-platform/external/rust/crates/serde fad912abf31d36b4409d7c01d6f34ccf8f7dc5a0
+platform/external/rust/crates/semver 9734c83f36ee336acbdcdcf9d7e196b8d6cfc802
+platform/external/rust/crates/serde 29937c15ad99c5248a0ac0dbac294064a48e2856
 platform/external/rust/crates/serde-xml-rs 3260038a931064b07a0d46db460e86842fc7bcc2
 platform/external/rust/crates/serde_cbor 34631826968c1b45fc4b07ad5eacecd4002391d6
-platform/external/rust/crates/serde_derive 95b629c31ece4f4477d9f3fdab41f5669d80d38f
-platform/external/rust/crates/serde_json c8d4368b5464acc6cb37ab517fc5254d924c6c5a
-platform/external/rust/crates/serde_test d972316ba608217df6ecfb9d624f9b27649d0551
+platform/external/rust/crates/serde_derive 6f3d2ec283367c22574316a18fb65ec34c89f34b
+platform/external/rust/crates/serde_json f3a342976c1464f8629654bc75f359aa03dba80a
+platform/external/rust/crates/serde_test d15c0badaeb6e7269fc46df46ff868e6b269ada1
 platform/external/rust/crates/shared_child c87fc15cddb78413004b3ce2e484e57707f2bd5a
 platform/external/rust/crates/shared_library db652cb25d61abe8800ec76577ba5e47f3e3bd88
 platform/external/rust/crates/shlex 7f7e7af6102e3481378f107e3a4112435ad2c960
 platform/external/rust/crates/slab 0ab261a0391e2e3b697a7e190f40409445240976
-platform/external/rust/crates/smallvec dedf93b955f425dc8577dcd8cac8340cdfd686f2
+platform/external/rust/crates/smallvec 4ce9f4c9e4859f2522330ce2fbac4798725dbfdd
+platform/external/rust/crates/smccc fba7a57d48e3769d86c9e448c5f805f3d93ea8df
 platform/external/rust/crates/socket2 55bffcc1d8f0e8da37d5414102a95ac6c293f9f7
-platform/external/rust/crates/spin 98c9f362903ec824b152cb75b7049e0a94d3c967
+platform/external/rust/crates/spin aecff3a08474cc6c601ce2294ec89f31a41ccd79
 platform/external/rust/crates/spki 86258102a4b2cc78d3e070cce8809e6b2d0a0187
-platform/external/rust/crates/static_assertions c205eac69eb98f3e603bd46940fbff2dff850510
-platform/external/rust/crates/syn 56a88a0028f45c28ffb2f8b7db82b84ba3c79400
-platform/external/rust/crates/syn-mid ab520c4c92c95d855f5e0d43f32c811abbbe9a91
+platform/external/rust/crates/static_assertions 2b30674957f70b82fc61a2f2880eeb69803c9aa7
+platform/external/rust/crates/syn 7595bf9c9627a708fa1dbe217ad54f575e454fc0
+platform/external/rust/crates/syn-mid b8a2d4856b9784015d9f9467a1de4c9717e3aef3
 platform/external/rust/crates/synstructure b5c2a2d04f7f3a884e280f67b8c9e88f1a6428bd
 platform/external/rust/crates/tempfile 71361b8c73ddfa85d262e741bd4a1626f627815e
 platform/external/rust/crates/termcolor 204377a67cc22aac8774fc93a39d0f2ace450e8a
 platform/external/rust/crates/textwrap 0fceca5fd2ca67e57fa3bbbf49859f969c06a8fe
-platform/external/rust/crates/thiserror 7287a54ac56a549e5f3bb7fd9769df73e46f3fa9
-platform/external/rust/crates/thiserror-impl 054ac805c41ae346c5f5c958a16300279cf795fe
+platform/external/rust/crates/thiserror 7db156f623ef0cb2ee8aaebd6ce91f70ed848ca3
+platform/external/rust/crates/thiserror-impl d39dc4fc4e79b44ae09ec47a28143bb23f3b3702
 platform/external/rust/crates/thread_local ebc472f104dd879bfa96f5ed4fc886506fc3800f
+platform/external/rust/crates/threadpool ddf0460a9dd33f0f99bacf305de4836c3bfa92e8
 platform/external/rust/crates/tinytemplate d7b96e6072a0d7684c3ec74a3ae0a076b61177c1
-platform/external/rust/crates/tinyvec 74a17ffdc64d277b018d0940de4165fc2259ade3
+platform/external/rust/crates/tinyvec 50883efdaffbeb589ee07daacd4d7edead895051
 platform/external/rust/crates/tinyvec_macros baa85e87c89872253d7070180829fef22253a6e9
-platform/external/rust/crates/tokio 35aa5f34551c4fb9d30e876b043ac58bc9d60bd2
-platform/external/rust/crates/tokio-macros c6a2d521eca1a9e5fd13e42f0044a1b1bf74de68
-platform/external/rust/crates/tokio-stream b6486bcfa854ecf419ee12a5f86dc9ec27762896
+platform/external/rust/crates/tokio 30b96c0247f1c3283580910d3d23d1fb48114f69
+platform/external/rust/crates/tokio-macros 4ce646944377cbde2fedb89744f831c2236a145b
+platform/external/rust/crates/tokio-stream 2655d587fb198b3f84850eec42b4f71707e980f9
 platform/external/rust/crates/tokio-test 420f7b1a5bfeb9faaf0f8b8a3d52081188c355a2
+platform/external/rust/crates/tokio-util 4842364b313c250adcf08c829a5d1e6ef7f25e62
+platform/external/rust/crates/tracing 5d8c10c69fb14d4c680bc8680fb2e4781f4391c3
+platform/external/rust/crates/tracing-attributes 4cd9acee476de48692cf538361fe81ef85600f96
+platform/external/rust/crates/tracing-core 874f6b83400198c139f7a202e0b78c8a739b5cae
 platform/external/rust/crates/ucd-trie d7008de02e7678daf0170abf7392e0d63e8bb86f
-platform/external/rust/crates/unicode-bidi 84ff5794081a6263e536621fec66fda80b6435a2
-platform/external/rust/crates/unicode-ident a3a87315e61958a69c801d8f95176e9802ca65d1
+platform/external/rust/crates/unicode-bidi e665988b7a6cefdddd706c9fe6bc2efbe8f26642
+platform/external/rust/crates/unicode-ident 44f100ee0d8a323e07090adb89967c8fa18e49a7
 platform/external/rust/crates/unicode-normalization 298525197efcf8bd3ececfe871d5107869ec0eb0
 platform/external/rust/crates/unicode-segmentation 3f3cc1c6ac0cb18b749f41c224cec8f5a6ed24f6
 platform/external/rust/crates/unicode-width dcd0cf855b1fbe64fd9935e2cb517ab64726213a
 platform/external/rust/crates/unicode-xid ff55ff12a49be076fe03120655abc7caea485872
 platform/external/rust/crates/untrusted 8e2b4d174e349883020dc72fb7b98e97d27faddb
 platform/external/rust/crates/url 5ba9e29e3ee9ac014146323bd702492d53dc7b4e
-platform/external/rust/crates/userfaultfd 82a8d750192c1aaa803aaa6731b6c0186d5bbce9
-platform/external/rust/crates/userfaultfd-sys 7dfa90c45ff3ab1471f6cf6a87e6a0fbba014ef3
-platform/external/rust/crates/uuid c7d453e17ba09b346e18f80e1c92b331b6bad45f
-platform/external/rust/crates/virtio-drivers 0b84d06c73c66284990886732ac61f5ceb1106f9
+platform/external/rust/crates/userfaultfd f1e91446ff1eb72b29aaf188fba74d9d26588964
+platform/external/rust/crates/userfaultfd-sys 67b9f176e372f06a5c133a99ff6a0acc4465ea6c
+platform/external/rust/crates/uuid 1cc2783591799af7a5de53d7c349a1a2d365965b
+platform/external/rust/crates/virtio-drivers 9abd73abe574db0c7866215bc71ce50db09ea80f
 platform/external/rust/crates/vsock 6e3d85501721c055638a2a8207d560a1a885065c
 platform/external/rust/crates/vulkano a9ecbf0be0d31f97bed44452d39712a09acba9d0
-platform/external/rust/crates/walkdir 8b31b35a62ab2c94e3d5d2ef63d45d1bce06e854
+platform/external/rust/crates/walkdir 6235cca50659610825f49f40252e3661b1aa74e0
 platform/external/rust/crates/weak-table 71e75dd8c6a615713f88bbf2a219ef9693db82ae
 platform/external/rust/crates/webpki 6278b23c14360c008fc911390b828c213832df9d
 platform/external/rust/crates/which a3e429b6608214c43ef6112f97138f9274a15d90
 platform/external/rust/crates/x509-cert b8eaa02855a7a553566f27ee88ffadb7cfb41f6f
 platform/external/rust/crates/x509-parser a40e794be5e820414a950654c7f9ebb3bf79c84a
 platform/external/rust/crates/xml-rs 2a37deb65566029cb442352763fa1700b927a924
-platform/external/rust/crates/zerocopy 231010b20bab2c8c96835b5bcfa25ad8ffbd06a1
-platform/external/rust/crates/zerocopy-derive df01df70e5b70a777614a436a0a9c188647357b5
-platform/external/rust/crates/zeroize 0b19878493be5f86d41ee72c6a2a648677b4cf3e
-platform/external/rust/crates/zeroize_derive 030d8a2534c130b056a0d3bdbc0b74bbef0801f6
+platform/external/rust/crates/zerocopy c41e411103fcda90153726e3442060d65b3ca42c
+platform/external/rust/crates/zerocopy-derive c92f1534400cbab54beadec101d804e0ed7c1fc3
+platform/external/rust/crates/zeroize 6c0fee2877e0293a29999da35ccefbc0c3a173b6
+platform/external/rust/crates/zeroize_derive 251057b8011a9a2d159e8ab7b9666e6a1eb80257
 platform/external/rust/crates/zip b5f7ba08227ecfb403b96ca42601a026a760104b
-platform/external/rust/cxx 7087a7380b689240871b96e1333c576c56274ccc
-platform/external/rust/pica 394d28572d67c038ba5ed78ce8be4bcfd5c233b9
+platform/external/rust/cxx c9416a99e677dadf6853847d899cabdf3c417843
+platform/external/rust/pica d5de6db6b34ade7e6dfbb384052ad4a16044c307
 platform/external/ruy e594be3530ec39f4d0ef1911a558f092f0a2d3dd
 platform/external/s2-geometry-library-java 0e573d1fcc8c63db367edcf4c231376f42e00cf4
 platform/external/scapy 8333f103c6c6ae2b9859e55e7f1f5ab6571564b2
 platform/external/scrypt 551208ea8e8a571d433b77ca3782173f7949ccf3
-platform/external/scudo fcb06c186d68a33eda45f94323380b8f91f2b5be
+platform/external/scudo 10b97e7812149c7ae6da9fe9f26d0b087492ca59
 platform/external/seccomp-tests 6dabe3918ff9797490d62f28189ea68ee362508c
-platform/external/selinux b450056138210e94694c6a9cadae3dd311751507
+platform/external/selinux 3ab595af61cbcc8ec6a8b73be6d0c28689867d2a
 platform/external/setupcompat a8f2868cb2a386835613fb3b9528b656d87c4c79
 platform/external/setupdesign e899402cc861b47a05d1f5950d516b6a8b5b39a2
 platform/external/sfntly fe29392acf34417778604bf77ca57aa133a820bb
-platform/external/sg3_utils fd06d03b41ff88adc00da0246b93e220bfb33b2f
+platform/external/sg3_utils fe9d79dae0fff3629cef3aad043624b40d402498
 platform/external/shaderc/spirv-headers a03f94d43f7dac9f54bcee8e69724ae91829bb60
 platform/external/shflags ad1ee02d5f85f1bbb068076dda521e82f2a713f9
 platform/external/skia 5ac1668013da3618f65fbdc8bb6957e492f64fb9
-platform/external/sl4a b3ee7bcb563feb661de4c974ac070a870ed48a31
+platform/external/sl4a 9d79d7baea51c158a3ccf471b0f448af11b8083a
 platform/external/slf4j 15241ce9ad84fb1f17b93bf885c173a0c0b3cac4
 platform/external/smali 70958d60f32aa50cc5ebcd9d740bf463986f8213
-platform/external/snakeyaml aa8c37367c27e3f63d9dbcdc2980891ddd40849e
-platform/external/sonic 9573b4934ddff17fe3ff308ea551ca82b680fe70
+platform/external/snakeyaml 0d5898cbf75122fecaddc9f11e8bedcee5346f83
+platform/external/sonic b36f68ccd55566bbd5cd866f7d59c6e2fcff3f33
 platform/external/sonivox f8f43222141a8dc1407cbe3c5e15539b7e94b54a
 platform/external/spdx-tools 18c78633ac349c203fa5d8a722089007eaa87b11
-platform/external/speex 6e12ac033c672e180a9f3b8346001eec6d60cee4
-platform/external/sqlite bfb0adbc442f56a4ca2aab027b0437f4fce65cb0
+platform/external/speex a4f34ced4638cb43ceab5024644b70b9d8ec6e47
+platform/external/sqlite 287278c22b1734b4aa262c2366592d7b61edce62
 platform/external/squashfs-tools 38188e278a68fb71579d199d4e7b9dbdd32935fe
 platform/external/stardoc b602f1e6a06273679058f7ad9d4f9a7ba6776e95
-platform/external/starlark-go d7963ebcba6eef5571217a2cbc42d170c2b26020
-platform/external/strace 8deaba18636db5658c50a4aba79e34a76bdb7808
+platform/external/starlark-go 516a1c1fc9cf9b45ffe246a82c48709fa5144685
+platform/external/stg b78438a5d94fc43f370c90a595c7a75b3225b5a3
+platform/external/strace a7cc849a52a4f0704eeba9bc57c85a0ac6263bc1
 platform/external/stressapptest e8cbf6146f67a9d3f68a771098082f32e3b0e461
 platform/external/subsampling-scale-image-view 9a0feff0f68b02798a332c4a42b1b1c02689ed58
-platform/external/swiftshader 9af3941307ee48b216f35a4be71bc365d02aa182
+platform/external/swiftshader b3efc43aee65d8e663c9219ce051a6553a9e6287
 platform/external/tagsoup a3f00b2e91e8cd32ca06193adac4da306e30a299
 platform/external/tcpdump 4d054ff7fa61e634121d82218c5b7e7b3cca5ce5
-platform/external/tensorflow ab3a68a394fc7d235e7a3f104a2541de98b5a6f3
+platform/external/tensorflow c2c55dea9bcc8b603de7cfe0f5cc216f9e2d436e
 platform/external/testng f93ffccf9fa92e8f071ffa46a72a3111fe837a30
 platform/external/tflite-support 4d91ae300ddc9a388394b8cd20008c0f160ff306
 platform/external/timezone-boundary-builder f2ff4b4b75da9aba73bb390291c5ec8158ebb28a
-platform/external/tink 8a0f8471938bc55d080bd327f4aa35105b972716
 platform/external/tinyalsa debc7ef1fd705c162a631b1d86f04736ab41b9fc
 platform/external/tinyalsa_new 2d7bc490c71e47eac3d32269272059d2ffad0693
 platform/external/tinycompress a1cd75a4bb0b2ddffa92450c89cd972762be1a5e
 platform/external/tinyxml2 5bd4e543623434ff2d7e3ffff34b7ff8994f6999
 platform/external/toolchain-utils e44050c792ea350759be80929afcc1aa849e2afc
-platform/external/toybox 1fdfc743e0395c27a20dde59725b9144a9a211e4
+platform/external/toybox 9884152d6f2d5b5a0a2dedc3c131b2e6abff0e72
 platform/external/tpm2-tss 6065318eb6c55eb176c935d3f04e79cf011889bd
 platform/external/trace-cmd 2c7791ac7fd34c0f8887a42e933e9261aa7e2e1a
-platform/external/tremolo 30b843542f0a242e7c8da62323bf63910f2bc5f8
+platform/external/tremolo e03eac30d509987c8675557b5a252c27916a7c08
 platform/external/truth 7308deb2c084ed06ecfff83d8b9190ba9f217806
 platform/external/turbine 00eca43939000481b0d3235f78a23c32ee340f49
 platform/external/ukey2 7552efb7b5ddddfc3e55d18db7a044bf7f013f7d
 platform/external/unicode 33642e99ba1bdbde791906f459ac9d5d71bb900a
 platform/external/universal-tween-engine 54967739025d3e6164a5124f79d43aa8c6298748
-platform/external/uwb 80cb68266e7553a33d16880c4685a5b3a6ce2411
+platform/external/uwb 6339f049e3fea9b0305300d7eeb6879e0c736f0a
 platform/external/v4l2_codec2 79de531dfdf642c593148db255a74190896a222c
-platform/external/vboot_reference cc0d5740d63b2480f043f22de2bb6b80d3c44164
+platform/external/vboot_reference 0f4d7570616e292302f449e92bc92ecc23d8cf90
 platform/external/virglrenderer b444c3649df11d006b077578be83857d7aec6700
-platform/external/vixl 0d844d424db14483c1cf41525a3b9f3e2af84c52
-platform/external/vogar ff9d1dfc5c74ad19cd27a5361531cd2da8bd76c0
+platform/external/vixl 30a06a0e76060a8955d664d68990801e78ccaf2b
+platform/external/vogar eae95f05cf1a8515032f11aff4bc593684ae17d4
 platform/external/volley e688e54d45f04974ec0ddbdf0915dc188e7a433d
 platform/external/vulkan-headers a789f9ba94364d09b0c5251da2a3b3201b3ec803
 platform/external/vulkan-validation-layers d7e61e7e290f75bc7bfa1554d0378c5e8f06b43d
 platform/external/walt ae9b4a7898b28c5fde303fd9579043eef3389f27
 platform/external/wayland 6ee7b087d8051bd335359ebb0f9eb6bb3edf94e0
-platform/external/wayland-protocols 4f8c3ea6b97ff834651728f4a4459bc405819dd6
+platform/external/wayland-protocols 400564c35e1a81ca08125992437c67e71d73ae47
 platform/external/webp 3e4a75a60df2d3bd3bf4985569c47c05e8c7df1b
 platform/external/webrtc e311b820a13ab9590ffedadbbed010ec988279a2
-platform/external/wmediumd 84c379565dbbedefe1dba03f58612f975ea817ba
-platform/external/wpa_supplicant_8 5b26dbc42c4ac02b9c304d416fbe4e6448379cba
+platform/external/wmediumd 08d07ebaf5979abdf2f0023dfe989c016a8aec63
+platform/external/wpa_supplicant_8 627c6a9cf25b04e73544a820e3f4fe04149c3f2c
 platform/external/wuffs-mirror-release-c c819655d679360d40468a5fd38863263d1be49cb
-platform/external/wycheproof 080ecedef102027a75e05eff0f0ac3e1cef39abf
+platform/external/wycheproof 61b19819eb681b3a4fdfaabbcf364b446f7ae606
 platform/external/xmp_toolkit d0f0fc44f62fa0720bd88dbd525e8ac3d52801c6
 platform/external/xz-embedded 0d14b6db5411887125a83f1a95635aeb53f2958d
 platform/external/xz-java 3736a4e542c163b85b40048db57d608adf15f658
 platform/external/yapf 322269168fad57b17a3dbe7923efddd9a58ba8cf
-platform/external/zlib a119f7d072ec5add20cea72a568cea2caf8d4b44
+platform/external/zlib da583a7660fe11ac75df50a457e520b3a013c848
 platform/external/zopfli 9d2f06a9600c4dc4ff77d639ccf2bf36be25ec61
 platform/external/zstd 32ed12e6122d805ec39aad8e91881dcaafdfe5dc
 platform/external/zucchini 0b3b142146b045f60fd63e7c98adfc9d1b961ae1
 platform/external/zxing 29b657007e78e198bef3c129293c6fbcea687e00
-platform/frameworks/av 6bfba1b0c499feb76e8fb982c70c8ce24730c3c1
-platform/frameworks/base 40500d79343f05d77a0a51ff962068d57b688dc3
+platform/frameworks/av 6a04846e284e64023fd1c4eb2460c4a4bdd112a5
+platform/frameworks/base a33014d501861f97c5da49f2da260c4b2b6caf36
 platform/frameworks/compile/libbcc 6525b3226c76cf11652c0a62e148414974a26d2e
 platform/frameworks/compile/mclinker 3620992766acf27b471d41ba937a9a292fe3a100
 platform/frameworks/compile/slang d015172e7a48fd277e7360c81a6810120ae444c4
-platform/frameworks/ex 1469f165aeade3b9cf70ec92a9506220f25bb6d7
-platform/frameworks/hardware/interfaces 6f50a8591ab8766bbdc7d1be1d2bdedd1f7b423d
+platform/frameworks/ex f8b0c128138c284f9a3f6800f6d42520ae96089e
+platform/frameworks/hardware/interfaces 9cf453cf82038722c2c869b0e93a1dc2d41f74af
 platform/frameworks/layoutlib fc607d67f8491c16cb6c341215fdc2bbf68b7a71
-platform/frameworks/libs/binary_translation a5ec09c7effc2d9b98d3708555173046bafc9a86
-platform/frameworks/libs/gsma_services 153e589575df0946b748bdf74fdac0f042e6c5ba
-platform/frameworks/libs/modules-utils 59552b1f77f2f0c865fe64662bf28eef4d6d059f
-platform/frameworks/libs/native_bridge_support afd00d4af4704370e7feda4c56de903b90bfd58a
-platform/frameworks/libs/net af83ca23ad6bf192957820c30482a8d304962861
-platform/frameworks/libs/service_entitlement 3f0b23481ac57d7f90c69a6255ef5e6f934293fa
+platform/frameworks/libs/binary_translation 4b52fa800be1c9c44eb8e6865d1854a29ca4f65f
+platform/frameworks/libs/gsma_services 9dce15ea54408947e5f30fc9c3b0b88b77c23548
+platform/frameworks/libs/modules-utils 58c4088e034eaa1a6839c522b868455166cecb47
+platform/frameworks/libs/native_bridge_support b294b6eb8a23a131e6afc1c9fbf8dfa3cac752e0
+platform/frameworks/libs/net 4a8ec1479371dd9a49e016aa8d798766ffdd4755
+platform/frameworks/libs/service_entitlement 79b147184c1f1bc8b16de6e536ec7ceb38c69950
 platform/frameworks/libs/systemui e245563864774abf36a3488c748a5271e48d9462
 platform/frameworks/minikin 4186d473ca2c0231b4475120cff791cc1c1210b9
 platform/frameworks/multidex 11c3539693eb636c5b29ae7bce95f036c1c89f4b
-platform/frameworks/native 88d2bfabf36981e6241107c608b187d7c8ba191e
+platform/frameworks/native a56335cda63530a062b9ab68586c459a7fd81d98
 platform/frameworks/opt/bitmap 0f6807f5ae1420dd9e6efb7ca897e75bf0768167
 platform/frameworks/opt/calendar 21f0c7b946b67f29c94230a4628baf23070e7f81
 platform/frameworks/opt/car/services 9ead00a60dd1460f87dded025ff582ea7b93b43a
 platform/frameworks/opt/car/setupwizard 6be50987518c9598bb107183869586f98e7645a1
-platform/frameworks/opt/chips bf22de240bef5503d75e122411e7f07fd13c9a61
+platform/frameworks/opt/chips 29e4f17bb92e62a30ff2c98f7a71f9a5cd269796
 platform/frameworks/opt/colorpicker 7e809008401a7db54048043c8145325c73f9827c
 platform/frameworks/opt/localepicker b1cb8e7154327e3493ad727c34773c4d408914cf
 platform/frameworks/opt/net/ethernet cd699555b201b37ccdf52d2f80d58a8532a673b1
 platform/frameworks/opt/net/ims 74c8f6ad814f52b6524f7a8bb5ff0bb77f1eadc4
 platform/frameworks/opt/net/voip 749184ef243224e4bdfbe7de13d236884500497c
-platform/frameworks/opt/net/wifi 74c3b48aa7614153cc4dd95825ee62d88a540892
-platform/frameworks/opt/photoviewer 5b1764a9cf515aca31ebc58cf6da3c9169b830bc
+platform/frameworks/opt/net/wifi 763313642c469b0d5ab090f2e8aafe52012ba2ed
+platform/frameworks/opt/photoviewer 6b3f9cb0b303b2c70d890ce57047701599c33d7d
 platform/frameworks/opt/setupwizard e52c3822d8733d6bf2b5ecc6c39b32b9cebb5bc3
-platform/frameworks/opt/telephony 2c361a77de72832b9498acf5e18f138c65076163
+platform/frameworks/opt/telephony f203e880c16b99719176badcce9fef98de6f0c8e
 platform/frameworks/opt/timezonepicker 9891db68cba52a1954415192d0707ce6785dc454
 platform/frameworks/opt/tv/tvsystem dccf1cf27d3471d50976b442b25a0d54e90cd256
 platform/frameworks/opt/vcard 7c9c476241fccc25879e29a9cf27529b54195bf0
-platform/frameworks/proto_logging 96b934def96203527ca1cb1f9a5c3e3b6a0bc028
+platform/frameworks/proto_logging 1f1cec14d8424ac1674ebaff25feedd33fe77e61
 platform/frameworks/rs ef16c707315bd995647a45ed5217e0cd550ba709
-platform/frameworks/wilhelm 998ec739d5827dca5c7c8ec7f27be30bcca5effc
+platform/frameworks/wilhelm a42a90859638aa0dfb1672bd4b40feb308157695
 platform/hardware/broadcom/libbt ffb477dd2e0b922666a290eef4266ddd31bc2550
 platform/hardware/broadcom/wlan 908c98927b7ccf5972d6530e6eb471bc116660a4
-platform/hardware/google/aemu e05911f6d4419df10d0ca3ea58aeeddfe4b63518
+platform/hardware/google/aemu 0c857799a7c4c2d5b421ec363c3cc5ce2daf2947
 platform/hardware/google/apf 8d3c579afd52a88c14794a6d9ce4a4869eaa8668
 platform/hardware/google/av 983270dd08ae46b15796010b4728cad05a26a524
 platform/hardware/google/camera 795563a54951a6983f03213a85e38dbf9d8c57f0
 platform/hardware/google/easel 9cedd8c51e2651015df54607a7b019bd7a038200
 platform/hardware/google/gchips 44e06c4cbfab5377b73dc12aa4612876abec9918
-platform/hardware/google/graphics/common fc1bfb76f2f8751d911b577598444ccf9550cfb3
+platform/hardware/google/gfxstream 62839085e18dd54721d6d139648231746217570e
+platform/hardware/google/graphics/common d513608639631c3ee4f44ddbdb4bb7b6ef840edf
 platform/hardware/google/graphics/gs101 c2e2b8400d8b6ef2e9dfcc3cfab2f58f3bb2ed1c
 platform/hardware/google/graphics/gs201 d00cb41b4fa1644aec7adbd44887383c544000b5
 platform/hardware/google/interfaces e709400cd91521b1b2454138620d4ec17b4e6085
-platform/hardware/google/pixel 1da3272a4d425cbfa808e1d79d82b38a9a75b22a
-platform/hardware/google/pixel-sepolicy c9f69a6c1dc9208453dac1ff901df65444fef176
-platform/hardware/interfaces 2b08791403f31a12eac78dec0d6c1506e07bccf4
+platform/hardware/google/pixel 6662c8cb58a9273c26e65c40a170df2286e5669a
+platform/hardware/google/pixel-sepolicy 4291cfa8264ab5640ded945742845bf6eef2341e
+platform/hardware/interfaces 700664b4ac42ec68ee192c58d93dda0c6379838d
 platform/hardware/invensense 899d1e694318198cb2b550132df3ceb918b876db
 platform/hardware/knowles/athletico/sound_trigger_hal 5b2f80ee4ae73502d2cae463ffed07431b724b59
-platform/hardware/libhardware 08350401dd803c8a58602255e8c90f2929ac950c
+platform/hardware/libhardware 0a5b296dd332fef9057874aa0abec62343614492
 platform/hardware/libhardware_legacy 1a2f675dea4a522190834f5667f9e85a36125674
-platform/hardware/nxp/nfc 08da6d2d169258abf036833455cabe76709a33a8
-platform/hardware/nxp/secure_element 5d0156345494c43d9f3d21b35bdef8f896f191b3
-platform/hardware/nxp/uwb b4a887085cff8a80d9888b898c3877229b26f7fe
+platform/hardware/nxp/nfc a272b436ae959016c3bfc1c322d82c90b3152d1f
+platform/hardware/nxp/secure_element 6c4402dcedc0ad50f149d4ba52e19561eed358f8
+platform/hardware/nxp/uwb f505e3b2869055916527717fb653be18d4badfcf
 platform/hardware/qcom/audio de6b5b71f7e992486b1b5f03214baf8a9ca04fd4
 platform/hardware/qcom/bootctrl 8178637f189b29d19c3eb9b1e185e93afa626d46
 platform/hardware/qcom/bt 9e083335a0d870cf9936632038e324a8854e6d99
@@ -906,169 +923,170 @@ platform/hardware/qcom/sm8150/media ac03f56055051aee0850951ffe29f61303e1c701
 platform/hardware/qcom/sm8150/thermal a83238342f9bee6bde3a869c3fe82218a076cd94
 platform/hardware/qcom/sm8150/vr 86508c8138684b2b240cfd91c7f63782b161ac54
 platform/hardware/qcom/sm8150p/gps b1f379d513b63e2ef2065b9e7f860a4eef20f383
-platform/hardware/qcom/wlan 928b648a7930b39e222d9340860ce6c6c7baab1a
+platform/hardware/qcom/wlan c4a5f29f2ad9164ed1a3e74ce3d3ef37362570f0
 platform/hardware/ril 18cdd261b17bb69c94c7d8ae5e74576ddacb01b1
 platform/hardware/samsung/nfc bb4f60ee812932569775f0db0da544c5f2af40a7
 platform/hardware/st/nfc 64cbf172af18711afc0577add529adb63e3ee08f
 platform/hardware/st/secure_element d511276ea865a5dab2203e81cd04cd89a5af14bf
-platform/hardware/st/secure_element2 f385ddc6d36e319fccd71e274d620194276a52aa
+platform/hardware/st/secure_element2 545cf527fdec41a6e0135dbefcd2192810a41f6b
 platform/hardware/ti/am57x 3b9a67372dfb7e3f9697d4c8c742fa26c8fba0eb
-platform/libcore f036b43b38da6b6ff997dbe8fb597ad360f895d7
+platform/libcore 29af950653fd6596ff763f4b91bed221a6a16070
 platform/libnativehelper 91675a647d7e6529a9e280e07dbc8faf704c413f
-platform/manifest 0afed90c8a284818909be198a372d8cc95ca74dd
+platform/manifest f936009eb5d76c2455330a8c860805e0f8946c90
 platform/packages/apps/BasicSmsReceiver 5285d6d15ec297d0a412e6f6bbac948da3525fe4
 platform/packages/apps/Browser2 927f361b4a93b77b19101b1bd4cf7d9428ce2a73
 platform/packages/apps/Calendar a067b3bdbc735f614c075cdd33212a83782a6c9a
 platform/packages/apps/Camera2 4b6f10908dcaf5fa2a1620a965ca355279d90777
-platform/packages/apps/Car/Calendar c3eff3da9806139335b4059300b318a1dea82e95
+platform/packages/apps/Car/Calendar 59771323be68e55ef066517d2c169710cca9ec76
 platform/packages/apps/Car/Cluster 95fcc12144ab94b8075a22028a8ed134bb1638f3
 platform/packages/apps/Car/DebuggingRestrictionController 1d41ecaa75a38ff966ccbd946644f2ea1f9a5859
 platform/packages/apps/Car/DialerPrebuilt e59cdd4e70d9515a46005bedb075eaab91787b1f
 platform/packages/apps/Car/Hvac 7c3c7fe692da31e42c8e97c9555289d2cce1cb50
 platform/packages/apps/Car/LatinIME 8be7f8faf501ab6b55353a8c5a852981ab818ea8
-platform/packages/apps/Car/Launcher 07b9c86cccb31d6e38c9876913b2b10432278253
+platform/packages/apps/Car/Launcher 48fa9df800a5486348b7c2c6900fb14d5bcf904e
 platform/packages/apps/Car/LinkViewer 801626c017ac51fdab06449b03268056c82ed9f9
 platform/packages/apps/Car/LocalMediaPlayer bb7fe44afda522de6ce70c45fd28c3dd74023061
 platform/packages/apps/Car/MediaPrebuilt af48dbc0df53731c86f54aa375167dec85ff9dec
 platform/packages/apps/Car/MessengerPrebuilt 71b1857c5a551b5832b5f80fea076be0b4da30b0
-platform/packages/apps/Car/Notification 7f0bc7d34bd85348656d46fc61814e8e436bd799
+platform/packages/apps/Car/Notification d02d96e0061d141fc052cc8562902b85fa25463a
 platform/packages/apps/Car/Provision 318c1493e4cdeeb9f835c84cc4ef41253533b15c
 platform/packages/apps/Car/Radio 967e5d5ef7245c7ff00ec89434049fab16fc2a97
 platform/packages/apps/Car/RotaryController 185955741089eaa9a0d1df8cc6e9eaaff71564da
-platform/packages/apps/Car/Settings 61face35b59d08fb67bdbf7d711dec953d4a5904
+platform/packages/apps/Car/Settings 36829ca2025fe476ebce47e4fe19d10e636b255b
 platform/packages/apps/Car/SettingsIntelligence 23ae4848898642ce27089bb67c4ad5e8f4a82a70
-platform/packages/apps/Car/SystemUI f5de081cf3db0c7cf8f38d85b445fb3d5cabd968
-platform/packages/apps/Car/SystemUpdater 9089c226c3ef94b6f960c8d895f6d20ba8295dbf
+platform/packages/apps/Car/SystemUI eb0b03d46fc85172e49f762f84985a51648d13bd
+platform/packages/apps/Car/SystemUpdater 031dc2d0c02886c71af6bd0fe6ad5b45a230b6d3
 platform/packages/apps/Car/systemlibs 921f6fd8520d0980c30af2897dd2f26be8e5bc4f
-platform/packages/apps/CarrierConfig f294f038e5e6274c75c03040ad63bdc0ddcfdd68
-platform/packages/apps/CellBroadcastReceiver 91b1e87f52335edfe8ddf277cc6dbb1d5ca371d7
-platform/packages/apps/CertInstaller fa842c980792bd6e22478cfd5b3f0338beb50d39
-platform/packages/apps/Contacts 8c585c5c648c1c736c23280cb4e1af840e489a94
+platform/packages/apps/CarrierConfig 19227f747adadb73d2f4e5813238f253363ffa23
+platform/packages/apps/CellBroadcastReceiver 4868aae7c89a836fe26a26d082e481afd9448d75
+platform/packages/apps/CertInstaller 0b93e881b976eb42a424103973a69801f11600a6
+platform/packages/apps/Contacts d563ca28296da31a5381c5d8084487c360f5452b
 platform/packages/apps/DeskClock 3ddbecc8292ba0e9232864b34c2fa2f5041e9f08
 platform/packages/apps/DevCamera 7965e16f438138eb77befa3980ab8d6978044266
-platform/packages/apps/Dialer 64a9c1a9eca8c138e5290947f8b9f8b970da7c8c
-platform/packages/apps/DocumentsUI 0ef9f7822e4a374b3448700f2d52b9882880313d
-platform/packages/apps/EmergencyInfo 07546db50064fa1c07197c52813a1070d8af6890
+platform/packages/apps/Dialer 69989d12a734740feb2cdeec24ea83560ffe4c3c
+platform/packages/apps/DocumentsUI ba176b0e23a9d02c3f870ea266208818718f628a
+platform/packages/apps/EmergencyInfo 830bb6b9412f2f1d2235fe65e7549b8701e55b54
 platform/packages/apps/Gallery 8acb85eda5f6d21db187213d9f163868c16e67e2
 platform/packages/apps/Gallery2 e4466883a23f04e00f6969be3de5da48bf22abc5
 platform/packages/apps/HTMLViewer 9d7c79c3cb8af9617a8d5d38b1f01849e1d75c6c
 platform/packages/apps/ImsServiceEntitlement 91b8140ae68c2e708bcfffa140220c87f40e8003
-platform/packages/apps/KeyChain 09661dc2e4375eec4af50a6db2f2a32a46eb6547
-platform/packages/apps/Launcher3 44dc3e9e45a7dc655b42a35de2ead35ec4e72229
+platform/packages/apps/KeyChain 1dfdddb7fca1f2e2a395a4ae6513411fad7306cd
+platform/packages/apps/Launcher3 5496fd34e089152bfbd753b57db3e2a5ed251623
 platform/packages/apps/LegacyCamera 186a9bfb78f2beba39cae836974bfe84e8126741
-platform/packages/apps/ManagedProvisioning 31a69bd50dbf0a8feef5daf310ec2d7536cbcc96
-platform/packages/apps/Messaging 8094b09a1196fa574bd6afc276e81789f8705e8f
-platform/packages/apps/Music 764acffa043f4951627fdefef2276187f7c2f4a3
-platform/packages/apps/MusicFX eb2a965d8493d340891e55aa06a2abf4575a4a66
-platform/packages/apps/Nfc 0c45bea5a677a0278d6f7f26978ecb2945182653
+platform/packages/apps/ManagedProvisioning 197e6b01601fcee7923c50f8bb4951c64464fbe6
+platform/packages/apps/Messaging 5451c6914c7f02225b1d73206b12c4a32acca72a
+platform/packages/apps/Music d7f48cc30fa7cfc9fd75c4523ad11a12224e1bb1
+platform/packages/apps/MusicFX 4cf2558e47fa86889e0466c9e36dd4692d1c026b
+platform/packages/apps/Nfc d07b5ad0c635d8b9466aec23a735dcd82fdc243c
 platform/packages/apps/OnDeviceAppPrediction 4253830a1f77f3418861dfb207bcf4375efa67e4
 platform/packages/apps/OneTimeInitializer 9d2ebf7eac79a62d8396df0fcb1481801d6b0e43
-platform/packages/apps/PhoneCommon df78f5eda6fd77369d2f67509fa16d16bc640a1d
+platform/packages/apps/PhoneCommon b1bb107a702c213c697f9751122c18fb1559883c
 platform/packages/apps/Protips 85fe46f8b3b9fb8bd4286fecfcff0b86301f64de
 platform/packages/apps/Provision bb1e8dd120f3d2ebb6c76b8fd370c181da8b1c75
-platform/packages/apps/QuickAccessWallet 8c77e2fd40ccb0ba7030214e4138c70f01cfa2b7
+platform/packages/apps/QuickAccessWallet e5766e33917f18aa837c9b834568ae9224e04269
 platform/packages/apps/QuickSearchBox 277824f231a00619199a62b7722b34fb11b7a02c
 platform/packages/apps/SafetyRegulatoryInfo ccf27ff0e6d758eaabd7231df340d0e46b010a84
 platform/packages/apps/SampleLocationAttribution db4a2ec782b67953019f5be6c33c8cf7982fc4c4
-platform/packages/apps/SecureElement 740ff73636ebff48f0576e568ce1a1eba9879e7d
-platform/packages/apps/Settings e31eb8e4ae57a3476ef0e13cc7abda034660943f
-platform/packages/apps/SettingsIntelligence a13667af0af1eb793166cf0cc928c199b1aa35f8
+platform/packages/apps/SecureElement af7f36b96cc04735e141ba85755a4893d8b23bc8
+platform/packages/apps/Settings bafe62e0242c43cb9b8f2538eda08d8ce6ce7ada
+platform/packages/apps/SettingsIntelligence 26522f358896e3fb8799c10011939ae6d27d8f5e
 platform/packages/apps/SpareParts a7171e8a15ab484b81a7bbae714abcbf62c10f13
 platform/packages/apps/Stk c356807c662caf273677bde7f3729c42dcc63fad
-platform/packages/apps/StorageManager 9ead17fe5864341570b773d1b05979fab80c0698
+platform/packages/apps/StorageManager 28c7ee143ae3f34a47dd119b3703e2262f120a28
 platform/packages/apps/SystemUIGo 33d19bb0e086a0513b134e80aef589d31e51b561
-platform/packages/apps/TV 2fb0eee71551b6cdbf3fa22483064091ed6d562f
-platform/packages/apps/Tag 2230877f669f27bb9621c7b6be5629a31d5f34a5
+platform/packages/apps/TV 8cef7174337a5cf101480f7054239eec599ef383
+platform/packages/apps/Tag c623d645ac3f4b8881abd59f28702e1ae7a99eaf
 platform/packages/apps/Test/connectivity 08c4eeebd042964669aefa05001b613b71e290ca
-platform/packages/apps/ThemePicker 44e735ea639adba82ce60bf8b1f462598c85b97e
-platform/packages/apps/Traceur bfce33f29bcf8ebaa2bb8a400d07cd1d627506b3
-platform/packages/apps/TvSettings 68fc0d0285f3d6aac9ddaed26eed7a17efece11e
+platform/packages/apps/ThemePicker ef51cef84a7797460eff323b478279476aaf775b
+platform/packages/apps/Traceur e64c846332f3fe8f6d02fa318775208ae66396bf
+platform/packages/apps/TvSettings 52c06f86040dc388418ee950347262b806697209
 platform/packages/apps/UniversalMediaPlayer 2ac7dd2e45400faee37b16b437c8982e7c48568b
-platform/packages/apps/WallpaperPicker 458e181bfa5c18d8cb6dbab77192c5d261ae9c4b
-platform/packages/apps/WallpaperPicker2 164be6d43232715c9b494cb7e0e72f4d556dadef
+platform/packages/apps/WallpaperPicker 64ce455b809761e470e418353c9fda4408ae9e4b
+platform/packages/apps/WallpaperPicker2 3f85a6d542e60fc2d09054ff48aa551b04c82fe6
 platform/packages/inputmethods/LatinIME 5bdb975e2a29a2f8e1c2a3e85b42a92a15d50af9
 platform/packages/inputmethods/LeanbackIME 28b6f6b0266e0ff8cf672810fddfe7f686d777a7
-platform/packages/modules/AdServices 0bf7948a13c138b75f6ee70cbb701a52888b3f8e
-platform/packages/modules/AppSearch 3f61fcc4cd5a2e03541758460685f936f75ca867
+platform/packages/modules/AdServices 4923552af650510df6ffd0e9ebf30ee4b1f459cd
+platform/packages/modules/AppSearch 9e4753629ed141dc15fba4faf3e61040f0e724a0
 platform/packages/modules/ArtPrebuilt eb905ca5a0db4b4386bc5cea26fd674608d94942
-platform/packages/modules/Bluetooth a3abd861cf5af969f000aa64e5a579e2a15ed8f6
-platform/packages/modules/CaptivePortalLogin 14df06d174f5c4a75db27d2e28ae8e1e8df74236
-platform/packages/modules/CellBroadcastService 0af0b0e53edced9364cd67e7a61f31ecada25753
-platform/packages/modules/Connectivity acf242c44408b1017865861bfc02c625b524e995
+platform/packages/modules/Bluetooth 7a6fc22bee0f5c5bb22b0ad62e0a623e7de72ccb
+platform/packages/modules/CaptivePortalLogin 203ca4e4c9339d18121f4f16310c5f14c55e3f33
+platform/packages/modules/CellBroadcastService 3b350bbfec124acdc51edeb43a7670b57bc9f55a
+platform/packages/modules/Connectivity 180a4881322a8953788789cd13b8c6e4cb8befab
 platform/packages/modules/Cronet d476ed88469c76836b26b6ad8f7960672da769c8
-platform/packages/modules/DnsResolver 9c4c1bd632d992754045d329ec179d7da7ce2372
-platform/packages/modules/ExtServices f670875b02f61a46d88fe2998cbae11d3a9188a0
+platform/packages/modules/DnsResolver d7f16e10302e0f49d4ba96ef95b05002fe61a9fc
+platform/packages/modules/ExtServices 6fd6f92607f2256c78f52bd73c4299bf836a8830
 platform/packages/modules/GeoTZ e42deae1285263d0c46e45ddc6cb5e7c621f29c0
 platform/packages/modules/Gki a54224ea2fe85d022436eed37eecb181bc44ccfd
-platform/packages/modules/IPsec 06505c80fa10aa8954b9d2e69a865c0864ace244
-platform/packages/modules/IntentResolver d66239f1c53e35042f70e47964473a4e22c474a0
+platform/packages/modules/IPsec 59380f831f1d341526925b6389a69490e249acc7
+platform/packages/modules/IntentResolver 1a016e5fa89fd29c9efe75d7dad77db6227d2032
 platform/packages/modules/Media ce5091748b48ac34c2696ca8c0bacbf999fa1f21
 platform/packages/modules/ModuleMetadata 772a50277ccfcdc4be22c01110de174d742fb980
 platform/packages/modules/NetworkPermissionConfig a1fa0e802598cf8d4c2e6df26f8d3cfa359d994d
-platform/packages/modules/NetworkStack 5f061cccf57779c72ed4c90278fcbadfb60252bc
-platform/packages/modules/NeuralNetworks 47bea5320249e0501d4fce0dfc7b20a68553609d
+platform/packages/modules/NetworkStack 556a9bf2d959d7c1763283535d3a9534fdb13cf0
+platform/packages/modules/NeuralNetworks bb2423abf9be383c74ffda1959ea2c40d2ba3648
 platform/packages/modules/OnDevicePersonalization 8181c96f0c647110225e5bb138ab9ef0a45c5e3b
-platform/packages/modules/Permission 5a5d35725d08aea8c0714a90055d8bc21d92f9b0
-platform/packages/modules/RemoteKeyProvisioning ed5d0f463084a2ac242dc4e15a5bc6438affe87b
-platform/packages/modules/RuntimeI18n d7aff3c66838cce4467bcf8b62622a1117c3dbef
+platform/packages/modules/Permission 874861b989f0bcf1f6ad978c827847bb0856b082
+platform/packages/modules/RemoteKeyProvisioning 1f981b2b214613fd62b48745e667e3d144538e11
+platform/packages/modules/RuntimeI18n 687f3fb1fcd08574a84af1be4d3c940303e4e019
 platform/packages/modules/SEPolicy 4cb9af51f110987c4c569afd098694f14dd6d642
 platform/packages/modules/Scheduling 6ace88aac39df87ea3b35a9ff3e2a72a47ddda28
-platform/packages/modules/SdkExtensions 5a877f20383415012978ccd7a049c6941d7a8953
-platform/packages/modules/StatsD 6d37b7fbb7bfa53c8b224dd5d89f0f2af074459b
+platform/packages/modules/SdkExtensions 8c389dfaaa1876abcc52c4ebf7dfef600820ebf9
+platform/packages/modules/StatsD e1a95b9edc5376f7396c4e79a5349bcbb9fbabf0
 platform/packages/modules/TestModule 3523a2f0f9b12d4e60374af63aae14f75a2b4c10
-platform/packages/modules/Uwb 2662fd7bd8fedb744f3b030be703be731f71b2e2
-platform/packages/modules/Virtualization 647b2e427ccf6ec141e0db493b63a02417f42964
-platform/packages/modules/Wifi 491b5313aa245d24b2feebd180ff60ed079641f5
-platform/packages/modules/adb 1e944170b3a235c1c6a8937f9d690f8aa8e4777a
-platform/packages/modules/common d43c39584f412ead92640fba82ee5ae735054060
+platform/packages/modules/ThreadNetwork 806512132ce7bf17764797a1eef359e0de1af050
+platform/packages/modules/Uwb d6c45b9ee0cc0d4f4204d2478302fcfe30f04d1d
+platform/packages/modules/Virtualization de635888adf8f2eb64bab0bd7b33e572c104cfa3
+platform/packages/modules/Wifi cef8d4dacb4aeef47b81e949b8b6e3f1a73bb8d0
+platform/packages/modules/adb cc1d4fd3a9077b41572b1eccb524e7a07d4c113d
+platform/packages/modules/common 59f08843c24e8c773907a4720f73a94c133a490b
 platform/packages/modules/vndk 57d80c43dbfcec051d4f02c4edddae216e082e5c
-platform/packages/providers/BlockedNumberProvider a196a5e3e0da01b45da5283e72e9103b12ca23b2
+platform/packages/providers/BlockedNumberProvider 334c2ce8cf9ffc451e06b4012cb9ad1e02a90732
 platform/packages/providers/BookmarkProvider 07821be016e64214b475a409dd56eda913687b5e
-platform/packages/providers/CalendarProvider 32558af194ee5369cda04572b27601fa9755e2c3
+platform/packages/providers/CalendarProvider 4c97a297dccd380358932e45eff43d75574eda15
 platform/packages/providers/CallLogProvider b9e4264099e03c8c3b6477a190c21ea5acc16546
-platform/packages/providers/ContactsProvider 684bdf3e0b4e51f1db4edc931948aea7200f73af
-platform/packages/providers/DownloadProvider bfb2b814103671cf8edcb5b2c356d39fb5e9b143
-platform/packages/providers/MediaProvider 27612b3a28ca87e48cecfef202e5d2ac7de706e1
+platform/packages/providers/ContactsProvider 54f64b40c1747cb7149a1a017841032cbe1d20ab
+platform/packages/providers/DownloadProvider 0653945e81453c1435e8a9da5774e770709e9dc8
+platform/packages/providers/MediaProvider 3b35e0af2a50a9406d8d221cc659a994f3139d0d
 platform/packages/providers/PartnerBookmarksProvider 430b3545d5df17821e667a790a374a4ee430643f
-platform/packages/providers/TelephonyProvider 63e983a4487452d607fe94cfc80c22a666bee709
-platform/packages/providers/TvProvider 69c388455c618428f4244643787ce38f295de36c
+platform/packages/providers/TelephonyProvider d5a564f5c7d2ed384a7cecdaade8951ee0114a47
+platform/packages/providers/TvProvider 9958981e4d8e542f59108fff0fc9d15626103deb
 platform/packages/providers/UserDictionaryProvider 459eb50e237dcddaf850ad2c1e18f2193e7ccffc
 platform/packages/screensavers/Basic 22e27bdf0b9490a8e43dad52e5bf5db60b9be846
-platform/packages/screensavers/PhotoTable 5bc17e1c5573b6251c6987645d7a0ce1cd335283
+platform/packages/screensavers/PhotoTable 58be4ce082d61187d1324866788a31b7d20d697b
 platform/packages/services/AlternativeNetworkAccess ba09451dc4a91744932e1e6c66db6ec96a5678f8
-platform/packages/services/BuiltInPrintService fb8bfe369f026ba1ea3030426edd5ad8bc2b5aa5
-platform/packages/services/Car 04cc2cbb2bea88fb5e5ce2a4671a9923e6e87483
-platform/packages/services/Iwlan 653eec3dc692e40eceac5d83ac49b0b5a53a5818
+platform/packages/services/BuiltInPrintService dd6ff0132b9b12f799385903dbf9ddb41f8ff52d
+platform/packages/services/Car 772d56fc2fea4c35db033ad6e51f86bd46ca1107
+platform/packages/services/Iwlan e1ab196ee7423fd67f70b0264fd4f65b7ff60187
 platform/packages/services/Mms 62a158499764b371bc8ca23c9d37fc5516535531
 platform/packages/services/Mtp 5677897e99c124260f8d0ebbb0eacd2b3e080331
-platform/packages/services/Telecomm e7e50a8cf1a9588f17b42461e4e90e12789248f2
-platform/packages/services/Telephony ac462a2e052836ae2e8d77614dabd2db1ffbe3bd
+platform/packages/services/Telecomm a28e8ca669f3b2820b75a657934d723ce347e907
+platform/packages/services/Telephony 7191dcb1ad953fbb552f385262d136a95741f984
 platform/packages/wallpapers/ImageWallpaper 0a1680f07b09889c7642a775b6bb69d1b27f9b09
-platform/packages/wallpapers/LivePicker 2283dbbe1446f0c4a566f53b2e682b1bb5f2e03d
+platform/packages/wallpapers/LivePicker 80eb56aac9725cd0576c21d9d96aedd201d562bc
 platform/pdk 7ea612c8fc04753350908fb4e926fddad8fffed2
-platform/platform_testing fe9cb9e258d732d3aa4a7c693b418764bfd0af58
+platform/platform_testing 2f67e26b43fe760d67c9b93d0c849f17a749d571
 platform/prebuilts/abi-dumps/ndk 9c5c35d622325129ae0a66d4f167c303cb1bc699
-platform/prebuilts/abi-dumps/platform e8e6ee7ac7199184cb7ada599d75bd5b9c762f24
-platform/prebuilts/abi-dumps/vndk 1a1de1cf23d9b30950e6a1809872c8286fb6f425
+platform/prebuilts/abi-dumps/platform 92e2de9374ef2e78c889b912fd24a9d70529794a
+platform/prebuilts/abi-dumps/vndk c6516bd3bcf98c2369856cfa6ddcd085c1e33968
 platform/prebuilts/android-emulator 894bba157dc85da7bc8a3e77375ba7cd502615d1
-platform/prebuilts/asuite 0d3abd8c8a7c5268f56d2095c15c276ad081b059
-platform/prebuilts/bazel/common f890cbd9c618b16fb53b8b0c48bb49c17930d4ce
-platform/prebuilts/bazel/darwin-x86_64 9cfed5fcbc12be90e398d66e4fb93d15df598c5b
-platform/prebuilts/bazel/linux-x86_64 1144b6c7c03cb87d029b8c5e1ce85a9ae6cae9da
-platform/prebuilts/build-tools 9b847f094a2081d6ffb634d12a1a94ff8ea0c77a
+platform/prebuilts/asuite d1f04ca47002ac0d6de2790098f6f3f2ee7847ab
+platform/prebuilts/bazel/common 6e4235468a8f22b6285826edb8c25ab3b06187eb
+platform/prebuilts/bazel/darwin-x86_64 8490f629dd7874dab92f3ed573d48baf733b3132
+platform/prebuilts/bazel/linux-x86_64 e018b9d3e704e00a3a4e018bd693015c1d19a6ac
+platform/prebuilts/build-tools 95f13bea5bf7830cb8390cc257b9a8dec7d70154
 platform/prebuilts/bundletool b2c1393ee0fbf7937488d8534bfc175c823f1590
 platform/prebuilts/checkcolor aff84131e56dd337d20778ec936a049f23e114fc
 platform/prebuilts/checkstyle b9509cda8d0176d4b97940ac423a048dfeed2b77
-platform/prebuilts/clang-tools f05be66a179554acdb5d307d1b55ceadf9465dd3
-platform/prebuilts/clang/host/darwin-x86 1acacc0994217ff5024d9a82e6c6c2d9abe64094
-platform/prebuilts/clang/host/linux-x86 3b5a3f78e6cc6cb9e8ae5bf58060de88c5684856
+platform/prebuilts/clang-tools 15b669bf3d3359ea2a085c857abfe2dc5f20f317
+platform/prebuilts/clang/host/darwin-x86 a00d91ac764d0436e1027cdc660bd909f309d387
+platform/prebuilts/clang/host/linux-x86 1b65fc03a2959185d1e85515ec5447cbdbe18c7f
 platform/prebuilts/cmdline-tools 9e68ef963e22834553fa98418fd83b3d10b67380
 platform/prebuilts/devtools e60e2ac20eeaa2eac82da9ed75579e12d91a527d
-platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8 3e030e6bbd2a18e1b6d12184d0d188df1a8f0c4b
+platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8 3d8ba025f64f8d68240709b5776719721d3d0c63
 platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8 9bfe1c60f5ce94e803561654dfbaba58dac9070f
-platform/prebuilts/go/darwin-x86 a2eab1c7e80979907a79569787163253a7e60574
-platform/prebuilts/go/linux-x86 8e977044f4594168c34d8cd52d23eb15a4947116
-platform/prebuilts/gradle-plugin 405c62262e91d541d9472d875f8ac051e761dcdd
+platform/prebuilts/go/darwin-x86 3a4cc430580e8def20c720d917ef6262fb9e0c01
+platform/prebuilts/go/linux-x86 4fb27b90571ac04328ff047d83ade35ea10049ef
+platform/prebuilts/gradle-plugin ad1a92c23a5f558cf80168d30ffcec37a13f7f20
 platform/prebuilts/jdk/jdk11 96ffcef37711d6681c9b84f5bbca53c15548df39
 platform/prebuilts/jdk/jdk17 ba24d07a917592795c60cc876f7f5883326ec7e6
 platform/prebuilts/jdk/jdk8 ebff3bab14fad9aefec53f8c1efa436be119ee80
@@ -1076,7 +1094,7 @@ platform/prebuilts/jdk/jdk9 3035eb193e0bbc9006ac99a89d529aa3bca6bcbe
 platform/prebuilts/ktlint 11e07e3254cca7f0393a69991ac7a394b0249504
 platform/prebuilts/manifest-merger 672168ba9e85f6e082c547d9e85181bdb7a565d8
 platform/prebuilts/maven_repo/bumptech dc6f0f88ec9c8445cdc86586ef4ae168c9e66612
-platform/prebuilts/misc a2bdbad67abd55ea3e643deb5e2517b4f5986c58
+platform/prebuilts/misc 6e5ed21504918a398b9e50f6a80642e032f526f5
 platform/prebuilts/module_sdk/AdServices 74445b61a33f65889efcab0704a7b63f6c4ba3d7
 platform/prebuilts/module_sdk/AppSearch 00ad3187b531f1664bd3084390b9861e3f14829c
 platform/prebuilts/module_sdk/Bluetooth 7d53a2b1985d233d9d6fb6246ce63ffbe1004f36
@@ -1096,117 +1114,121 @@ platform/prebuilts/module_sdk/art 46b5e3bf74719116e499477cdd499b3b2fcc97f6
 platform/prebuilts/module_sdk/conscrypt b35104cfe516dfe863dc20d2b79ca78fca0fca44
 platform/prebuilts/ndk eb4ed058054a994d30b965809e38a79b4becf280
 platform/prebuilts/qemu-kernel 8adb819be605d1ebbc20a75fdf38f0c23f66e778
-platform/prebuilts/r8 d659580dcd754b8364f238e3cb4d21378f61da01
-platform/prebuilts/remoteexecution-client dfb6bead9556ded3d7994f576a5f35d09ca6582c
-platform/prebuilts/runtime 3ad53524e35e6c74556e6d9a795c2f8e15d1312b
-platform/prebuilts/rust dc041039dc7be0584b2dea169c5dc113b21176bf
-platform/prebuilts/sdk 09c50b267fc51e0fdea3ce025b3d3f02415582e9
-platform/prebuilts/tools 266f640cee26075fb147996455e7cff4aa117e43
+platform/prebuilts/r8 b4f84ff37c682ea25111aab1d1b9c9c0908d0b14
+platform/prebuilts/remoteexecution-client cbb6f28f63ca74e241c3c365967501fa51ba1d85
+platform/prebuilts/runtime 54111331c5e0625d616c1808e569371ef9afecf4
+platform/prebuilts/rust 396eae929c8f4b2bcb685067418907e46fa7ddf7
+platform/prebuilts/sdk 08df2b7aec7cda7fa900e0934d0adb51e5d65209
+platform/prebuilts/tools 59e7c6545369b3454dd5cde362c412a03f520c6a
 platform/prebuilts/vndk/v29 cdbaf8e9b7d3f478e58ab32059fce005350a5ed2
 platform/prebuilts/vndk/v30 47992d07b3aea5f1db60e4acf4608936c0b91672
 platform/prebuilts/vndk/v31 676dab1273673d10d95b453c9fa827d14754bc89
 platform/prebuilts/vndk/v32 3f3d81d661fcf26693eed5e20c75ee8159d5ce71
-platform/prebuilts/vndk/v33 5bfc33514669d70d823005b8635d6804bb9822af
+platform/prebuilts/vndk/v33 953b147ab273f9144cbdb7006eb655d31c4283ec
+platform/prebuilts/vndk/v34 7750012822612d39e1ce6b267cbf65ba497955f9
 platform/sdk da990d0543b90a3a336f043af0912b9021a97d37
-platform/system/apex 8b9e3b03eddab9db5d5a245091bf7388f2ec7bd0
-platform/system/bpf 1ef925d8c44176eb7650886a1c3fbb13048daa9c
+platform/system/apex 324a95c809ff9f576bff8d5f1b972c22c6110428
+platform/system/bpf 96f2baed3ae76b698327db2b76bace590e0fbaf6
 platform/system/bpfprogs 67cdd85880e694ce5cede9bdc7c7ec67b405aa38
 platform/system/ca-certificates 215acd963bc39519859a9ff5f5e475d219859a64
-platform/system/chre f30297353f8617237ba342770f7d88b0376f6284
-platform/system/connectivity/wificond 3d176f87150a4fd8ec9050445e451772a7ab2879
-platform/system/core 3988a17ebcf1665c9ae5d976072dd393c2c557d4
+platform/system/chre 98a6610a64883e0fe9e16d0f9b9e5781b2ba05a5
+platform/system/connectivity/wificond 9b6623de7548cce16d7ff20abbaef94af914181d
+platform/system/core 3fd12b7b552dbd46b95e90374b3c2502faecb38d
 platform/system/dmesgd d71ad3d81aec7c7721179588de02bed9361c11bf
-platform/system/extras 52e14563033bf4508e410ca1ee624ffb8d9c9762
+platform/system/extras aecfa72aef29f343c38cc90925d6b030239c4f90
 platform/system/gatekeeper 3cf0fc853d3d777f0a59b06910e12fc5e428db73
-platform/system/gsid d61b96a08728cf6c006c81d894e46494362c109f
-platform/system/hardware/interfaces d12f84cd2f52f9d25e8d6e72bf36497e2a8cc61a
+platform/system/gsid 60c2a825dabca395a018ce34c6ac8e08523f0219
+platform/system/hardware/interfaces 6487f17c3002e33b4eb1f49be8e712d0ad7339eb
 platform/system/hwservicemanager 8fc42c49c3c5dc71a5ac8c8886a5cee1d1b4b5bf
 platform/system/incremental_delivery 0a1d4740017ca8d9f22dceaffcdad400d9aea676
 platform/system/iorap 32a984ca1684f55b92307f9e5a808d68ceb106eb
-platform/system/keymaster 4d30188dd447efd874e9cb90e4856c4101104ec8
-platform/system/keymint 44d0cb2a929e0ccc213081b6c1174abc5b8702e5
+platform/system/keymaster 44dcdf6507add2c0136e2aec92557af6e3139c18
+platform/system/keymint 7a62e04bdffab834e1b6333deb0db1419a4a7408
 platform/system/libartpalette 817a255f3e1793d2f0910c19ebc17012c37d48b2
-platform/system/libbase efd828a5c85d3052b0a39af5aa49d812920fa48f
+platform/system/libbase 70d03d295e7c08aec1da16437db4e03032f5a911
 platform/system/libcppbor aded0058e6476ec6266dc9abb9727fd7428272bb
-platform/system/libfmq f2e4062901f9b3cc2c379830c1a320f3e597fed2
-platform/system/libhidl 3415c88400b7ac8a6b79b85e3c63591db4df64be
+platform/system/libfmq 1f66b00d1ce19a9941ad2de870a84008deca5a6d
+platform/system/libhidl 1edd07f8562b0d956434eb26fdc6e0116f4c2db5
 platform/system/libhwbinder 0e41eebf9d5100bb848ef31471998cf9a24e8efb
-platform/system/libprocinfo efbad9875eb0f40447bf35c68430afe76b479c6e
-platform/system/librustutils acad644fe49f9b1aa717cd21310dd71c414f0302
+platform/system/libprocinfo 5acaec6fa81988e78c656260762f36e1bd4b6f69
+platform/system/librustutils 62d8963a45e584db365449759aba194b4e12edc0
 platform/system/libsysprop 58a97600c053bc63be1faf3bee12e88f52a3cc6a
 platform/system/libufdt 9717642ee3a1ae70bb0f70000476ede1c111a987
-platform/system/libvintf 2663a696c0e1240875376d66469ae4e14d151ed7
+platform/system/libvintf 94fb1a6c169343862b84070611a4b98612596079
 platform/system/libziparchive 757bf593fa02d2120e42f4a49fd090142ac02799
-platform/system/linkerconfig 4807fa4da15239e1794ff4b0fae7333b0ed0f251
-platform/system/logging c35499295cad4c19711549fd9120cfed962d21d0
-platform/system/media 2f20445c0b2c796d7cd579c1c3d579dfd269ae66
-platform/system/memory/libdmabufheap 6bb15e5396e46f8934fffd0553921974da51b63b
+platform/system/linkerconfig 83a18e4a66f302c5521eaf67e419325f23d40f46
+platform/system/logging 8bc1a0d31af70b80cb878cd9c01fd67668ac690e
+platform/system/media e37051ebf7744e69dc99fd9a1b80019b6b5654ff
+platform/system/memory/libdmabufheap b037c613c65b484db8d6bd698ade4f7144162d7b
 platform/system/memory/libion 8d66539a69260073890e61fe8f3c8aec7746e4ce
-platform/system/memory/libmeminfo 2c10eb06450b21fe1e5aeb5145c229e756bc213e
+platform/system/memory/libmeminfo d92f79131bcc5e088a74b71db77f5b7ff3f19cd6
 platform/system/memory/libmemtrack dce9cbc8f5e4cd46aeec62bc63cdbcf226d68441
-platform/system/memory/libmemunreachable 86fbb25e0cc25a8df940a6b2a10e828815974f41
-platform/system/memory/lmkd 425955025db5fa83083e63f7dd23f41f09e081c7
-platform/system/netd fb69ecfddf02347b5c4792fb2a19791109fb2303
-platform/system/nfc c39aab977c1dad9e69ad7491404c6c5fce62f4ae
+platform/system/memory/libmemunreachable d29e1b488aee963a0f1892cff589f41c201f1371
+platform/system/memory/lmkd 6cdd2fa28fef2e3a3449b3be06e9e8e74a540223
+platform/system/netd 16d651b17dc5e180702bde4ac7316eee656b1d09
+platform/system/nfc 89253296215044b075255b451ee5eee00373d225
 platform/system/nvram 4835931928431022b21248ff594cc7980d78ec2a
-platform/system/security 0460b75b0ae1307bb5325f4793daa5c7d8226b06
-platform/system/sepolicy 19a6ae271ef440a8e39af0ab368ad4cd2a3e947d
-platform/system/server_configurable_flags 992a4d007dde81d0cb723b1b70456726555f54b9
-platform/system/teeui 881f1ef2f92c38743ad1ab141a22ed6dfcf2f127
-platform/system/testing/gtest_extras a8e041e379eb54ace0e50ba7b382826b3e311c7f
-platform/system/timezone 8d3aded3ca10f8e11746adc0e3c1c70a3e06460a
-platform/system/tools/aidl 7d9a964d7d9c4456c4a49251700f56c462ecbf36
-platform/system/tools/hidl 4f4dec803510428720d389584f48c06f8d798f84
+platform/system/security 02a5780306f23033a272315a56b9ad15bf553460
+platform/system/sepolicy 4a84312734d9ee96ba18a4f15f19ce4b6ec83b37
+platform/system/server_configurable_flags f92325d5d58582b95f82dbadca3462fd3920827d
+platform/system/teeui d9f2038709c2a5a34890d3c3bb0174e7e43d40eb
+platform/system/testing/gtest_extras f8552d59abdfff2e83688545d3d0d8cf4fc924f6
+platform/system/timezone bfd2648ab1435a0f548a7517ef546abc7beead14
+platform/system/tools/aidl c4371b5ab89c7aa4e2ec2d7876e1f0fe69760535
+platform/system/tools/hidl 6bcc06ea14246106a27831ca180a6d36bbece367
 platform/system/tools/mkbootimg e6e107c7491cb3f7edf7d4676f67c167f0ce0f0d
 platform/system/tools/sysprop f1840d1ed45a71bfa71b42cbee21c95deee4797d
-platform/system/tools/xsdc b5ccf32639303c282c73fa15a44b3ef486360df3
-platform/system/unwinding ef26220cb2057368d0ff09ea781a78877baa7cf4
-platform/system/update_engine 046311f82a3231468c1b56e24182e99046d21b07
-platform/system/vold 417fb0e5c3a31780b2e19371a9e85f2427a4c2e8
-platform/test/app_compat/csuite 00aca6f9f6de0fcc73f84786e1647cbb2924a154
-platform/test/catbox cbe51d1bca6cd696b4485dfb8fd8bec1906710f5
-platform/test/cts-root 04e002912d581e18725acded0fc1543f1a3ef132
+platform/system/tools/xsdc 361be773c2f48025fda412ba90c7938c53dc0784
+platform/system/unwinding 91d2acdd5f4071a3ffc02d0faaf7a893cf13989a
+platform/system/update_engine c2a110be8ac9e14b7d1bef33fc4cfc13b3ab1385
+platform/system/vold 432b103163d9c306c5d0e078af4662c51c856705
+platform/test/app_compat/csuite 56c349c11a10b4ed547592f0aff8c49d03896ab6
+platform/test/catbox f50e723470dca923e682a0fd365c66d0a8b5cbec
+platform/test/cts-root 0d40c84ffd739131a2017e64c86804d65cda7126
 platform/test/dittosuite 6c97c995bc91ea386ada4159daa77d8522e15b99
 platform/test/framework 255a086da9f724180c0d8a797ab093e6e21841b3
 platform/test/mlts/benchmark c838ef8619ef00956b37f9c3b3be04917ef74f5b
-platform/test/mlts/models beaac0db7690a0cf51cf152144c5cc1b91431a70
-platform/test/mts 91694b6bab32e3e6c0006fdc3899602b0615b8d9
-platform/test/suite_harness 475f2684b44ed044723e7e62970d144d9f148bfe
-platform/test/vts bce0880e490526a47f269d2c10fafe87f0f4db8f
-platform/test/vts-testcase/hal f89face4b1a856d64ab73c3b180c814f71c6068a
+platform/test/mlts/models c040af1083ad94f20cb8160365fa0cd128492ca3
+platform/test/mts 59f63126bd93705d5759a5967d9918cecc8928b1
+platform/test/robolectric-extensions 660c6ce7f65dcd4aa835895c1b3a6c15a05fa35e
+platform/test/suite_harness 6bf324b672747371f6bcb525c9f5cf28ac52bd31
+platform/test/vts 557a40cfc7ffa79520e7d3c4b627bde5fc19c7eb
+platform/test/vts-testcase/hal 0561d6e6e65b18d9601a9bdb7cf1899559d52be0
 platform/test/vts-testcase/hal-trace 3782d14cb8ca24996b199e175525eeea47758632
-platform/test/vts-testcase/kernel 412640fb0fdd23f6716518f06d3fde933bd332c2
+platform/test/vts-testcase/kernel 3ed5d27302fc5b4fd0d5202b6fc1d1c79482354b
 platform/test/vts-testcase/nbu 48eb5964b710b3e6a9a244b6b098e69361fcbb6e
 platform/test/vts-testcase/performance e27d02dd550c8f6fad539b32d99cc6ade245afa0
-platform/test/vts-testcase/security 074dc8cd4f6759d7604d4ea1a30435c6a5d5a151
-platform/test/vts-testcase/vndk 992b9872444732cc4a1ed41a61ea1e2140c0414a
+platform/test/vts-testcase/security e1bca9fdff57ec15fe3c37f574fed299e598bff3
+platform/test/vts-testcase/vndk aacad8ca6e6cbcc98f32e8d9ee4db1947ba88398
 platform/tools/aadevtools e5fcc6ca8715e31526ec5b6a150338e99e0bb234
-platform/tools/acloud a3be79c7e568ba12f9d8597e3e0b4984f0de22b3
+platform/tools/acloud d19ef0fefb4820a50d0ea3045d9fbe8a1a1c417f
 platform/tools/apifinder 319122b36e45bbc1bca9da4a0b7dad264899563d
 platform/tools/apksig 945d2dbab257b3d2f12c5928a7722ce0ad46534d
 platform/tools/apkzlib 3a1237b6e3c26849e9925d6cb96386acb1ddc7b2
-platform/tools/asuite 9d43de2f19a3a42ff81a9aef94591a7a9f17febd
-platform/tools/carrier_settings 42fc7c0e345a3d42adb4e28d5034795c8c77e192
+platform/tools/asuite 8870525792763ea1d597adfaad1a3c8d81eda8be
+platform/tools/carrier_settings cddb69c964f8ebf79c1b759008e6fd9f4d34140e
 platform/tools/currysrc 2649cdecea09c16ce766a9a0af08372e3513bd3c
-platform/tools/dexter 2ed2ceddfbf81e13d68f9498c17d7bed8a2aa401
+platform/tools/dexter f715a91d31e3030de497df997dee3af3735e5e74
 platform/tools/doc_generation c3c86bb2e7f650620a7ff98ade30f1291904d082
 platform/tools/external/fat32lib 9645f0b07a03dafb67d98d268db74dc6f17eca0d
-platform/tools/external_updater 47ad7cdaafd5d14f75ac4080a5fba526416c3b80
+platform/tools/external_updater 215a4209212e4a450c43ed00a92c1e94450b9d26
+platform/tools/lint_checks f9094730e3edbd99b4f6995c00ed4aec38eb8bb8
 platform/tools/loganalysis 921048804cb04a03df9c00634cd5bd66173920f1
-platform/tools/metalava f834b935f32328bce0b99322a754d6696e8c865a
+platform/tools/metalava d0fb191ba99e0834c63708baa93fe1cecdec60d5
 platform/tools/ndkports 7402e90928131c52c3f8c97ab4874b9384b5803c
-platform/tools/netsim 530be82a7a9a403bfd61789e59ed64f4f08e2c7d
-platform/tools/repohooks 9a98160f6a5dcccf9752b5d85883cd43942d611d
-platform/tools/security 4dc46b2614ab2c0c42cc2bfa3d290419158353ea
-platform/tools/test/connectivity 280abab00f5e40425552c80899362418c54892ae
+platform/tools/netsim 8299e654768d61a176a1ae39efdb0227fc644c89
+platform/tools/repohooks 3d7f449589443581508c4460939bca3b1005ccd9
+platform/tools/security cbe067ba7b830bd0375f3b83c7548af4b67c51a5
+platform/tools/test/connectivity e6ee6305cb545d9235856164778a5f209f36039f
 platform/tools/test/graphicsbenchmark b708f4b7436fc4dc6bab6f43c84d2dd328655898
+platform/tools/test/mobly_extensions 1c982e13f1a932434881c9ae1bdf63c93a615e36
 platform/tools/test/mobly_snippets 06d5bfb5c85e99c4fb15c7614d1bfc1f16d3d6d7
 platform/tools/test/openhst 46153ecf585c8ffa9b3bdd4fc4fe55e7af021df6
-platform/tools/tradefederation fff3d659a4f799f6847ebf65836bf78597d78aef
-platform/tools/tradefederation/contrib 91125954dd355a7b5c3c3c5e05c00cb5ec761fa9
-platform/tools/tradefederation/prebuilts 14a37205ff7950ac8610dc60b8e1869f75ec8961
-platform/tools/treble c71af1e5420873802abc3ea2d13564782f1415c2
+platform/tools/tradefederation 704d27bac4ff6aae2b4894167d82a348fe71c063
+platform/tools/tradefederation/contrib ae5824922aef10be18c3ac69cb85c009ab5215cb
+platform/tools/tradefederation/prebuilts d12409af512313e97ebe15f172989f499d11c142
+platform/tools/treble 249c5e9f8bb7a742520d294d51939e43b9a01469
 platform/tools/trebuchet e4b1e4946c8b3374986f9e981f26e5da358b8afe
 toolchain/benchmark ea08979b75076a463a75bac8c72c6ea4ddbc2d9a
-toolchain/pgo-profiles fb28eda9f20d4abd444192abf1fda6899871112a
-tools/platform-compat 2c9e2e5efb080c7b6f884ca85e39e83c0c785260
+toolchain/pgo-profiles e55bc461f48b6451ffca922d3e6caa4897e7e35e
+tools/platform-compat fade4514ca45921b93426ed80152c5c84b2a8cbc
diff --git a/test/gecko_profile_generator_test.py b/test/gecko_profile_generator_test.py
index 97cedd6..1c744f9 100644
--- a/test/gecko_profile_generator_test.py
+++ b/test/gecko_profile_generator_test.py
@@ -41,6 +41,38 @@ class TestGeckoProfileGenerator(TestBase):
         golden_path = TestHelper.testdata_path('perf_with_interpreter_frames.gecko.json')
         with open(golden_path) as f:
             want = json.load(f)
+        # Golden data is formatted with `jq` tool (https://stedolan.github.io/jq/).
+        # Regenerate golden data by running:
+        # $ apt install jq
+        # $ ./gecko_profile_generator.py --remove-gaps 0 -i ../testdata/perf_with_interpreter_frames.data | jq > test/script_testdata/perf_with_interpreter_frames.gecko.json
+        self.assertEqual(
+            json.dumps(got, sort_keys=True, indent=2),
+            json.dumps(want, sort_keys=True, indent=2))
+
+    def test_golden_offcpu(self):
+        output = self.run_generator('perf_with_tracepoint_event.data', ['--remove-gaps', '0'])
+        got = json.loads(output)
+        golden_path = TestHelper.testdata_path('perf_with_tracepoint_event.gecko.json')
+        with open(golden_path) as f:
+            want = json.load(f)
+        # Golden data is formatted with `jq` tool (https://stedolan.github.io/jq/).
+        # Regenerate golden data by running:
+        # $ apt install jq
+        # $ ./gecko_profile_generator.py --remove-gaps 0 -i ../testdata/perf_with_tracepoint_event.data | jq > test/script_testdata/perf_with_tracepoint_event.gecko.json
+        self.assertEqual(
+            json.dumps(got, sort_keys=True, indent=2),
+            json.dumps(want, sort_keys=True, indent=2))
+
+    def test_golden_jit(self):
+        output = self.run_generator('perf_with_jit_symbol.data', ['--remove-gaps', '0'])
+        got = json.loads(output)
+        golden_path = TestHelper.testdata_path('perf_with_jit_symbol.gecko.json')
+        with open(golden_path) as f:
+            want = json.load(f)
+        # Golden data is formatted with `jq` tool (https://stedolan.github.io/jq/).
+        # Regenerate golden data by running:
+        # $ apt install jq
+        # $ ./gecko_profile_generator.py --remove-gaps 0 -i ../testdata/perf_with_jit_symbol.data | jq > test/script_testdata/perf_with_jit_symbol.gecko.json
         self.assertEqual(
             json.dumps(got, sort_keys=True, indent=2),
             json.dumps(want, sort_keys=True, indent=2))
diff --git a/test/testdata/DisplayBitmaps.apk b/test/testdata/DisplayBitmaps.apk
index 63b4074..2911edd 100644
--- a/test/testdata/DisplayBitmaps.apk
+++ b/test/testdata/DisplayBitmaps.apk
diff --git a/test/testdata/DisplayBitmapsTest.apk b/test/testdata/DisplayBitmapsTest.apk
index 1580719..db5575e 100644
--- a/test/testdata/DisplayBitmapsTest.apk
+++ b/test/testdata/DisplayBitmapsTest.apk
diff --git a/test/testdata/data/symfs_for_no_symbol_table_warning/elf b/test/testdata/data/symfs_for_no_symbol_table_warning/elf
deleted file mode 100644
index a92e41f..0000000
--- a/test/testdata/data/symfs_for_no_symbol_table_warning/elf
+++ /dev/null
diff --git a/test/testdata/etm/perf_inject.data b/test/testdata/etm/perf_inject.data
index 4c121a3..9f83430 100644
--- a/test/testdata/etm/perf_inject.data
+++ b/test/testdata/etm/perf_inject.data
@@ -20,5 +20,6 @@
 10a0->1054:1
 10b0->0:1
 10ec->0:1
+// build_id: 0x0c9a20bf9c009d0e4e8bbf9fad0300ae00000000
 // /data/local/tmp/etm_test_loop
 
diff --git a/test/testdata/etm/perf_with_missing_aux_data.data b/test/testdata/etm/perf_with_missing_aux_data.data
new file mode 100644
index 0000000..781a0a3
--- /dev/null
+++ b/test/testdata/etm/perf_with_missing_aux_data.data
diff --git a/test/testdata/perf_with_interpreter_frames.gecko.json b/test/testdata/perf_with_interpreter_frames.gecko.json
index 1903451..9959265 100644
--- a/test/testdata/perf_with_interpreter_frames.gecko.json
+++ b/test/testdata/perf_with_interpreter_frames.gecko.json
@@ -40,11 +40,25 @@
         ]
       },
       {
+        "color": "blue",
+        "name": "Off-CPU",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
         "color": "grey",
         "name": "Other",
         "subcategories": [
           "Other"
         ]
+      },
+      {
+        "color": "green",
+        "name": "JIT",
+        "subcategories": [
+          "Other"
+        ]
       }
     ],
     "debug": 0,
diff --git a/test/testdata/perf_with_jit_symbol.gecko.json b/test/testdata/perf_with_jit_symbol.gecko.json
new file mode 100644
index 0000000..bb8940a
--- /dev/null
+++ b/test/testdata/perf_with_jit_symbol.gecko.json
@@ -0,0 +1,1486 @@
+{
+  "libs": [],
+  "meta": {
+    "abi": "aarch64",
+    "asyncstack": 1,
+    "categories": [
+      {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "orange",
+        "name": "Kernel",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "yellow",
+        "name": "Native",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "DEX",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "OAT",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "blue",
+        "name": "Off-CPU",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "JIT",
+        "subcategories": [
+          "Other"
+        ]
+      }
+    ],
+    "debug": 0,
+    "device": "Google:Pixel 4:flame",
+    "gcpoison": 0,
+    "interval": 1,
+    "markerSchema": [],
+    "oscpu": null,
+    "platform": null,
+    "presymbolicated": true,
+    "processType": 0,
+    "product": "/data/user/0/com.android.simpleperf.debuggable/simpleperf record --app com.android.simpleperf.debuggable --in-app --tracepoint-events /data/local/tmp/tracepoint_events --out-fd 3 --stop-signal-fd 4 -g --duration 0.1",
+    "shutdownTime": null,
+    "stackwalk": 1,
+    "startTime": 1596654389000,
+    "version": 24
+  },
+  "pausedRanges": [],
+  "processes": [],
+  "threads": [
+    {
+      "frameTable": {
+        "data": [
+          [
+            0,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            1,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            2,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            0,
+            0
+          ],
+          [
+            3,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            3,
+            0
+          ],
+          [
+            4,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            7,
+            0
+          ],
+          [
+            5,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            6,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            7,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            8,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            9,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            10,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            11,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            12,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            13,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            14,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            15,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            16,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            17,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            18,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            19,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            20,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            21,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            22,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            23,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            2,
+            0
+          ],
+          [
+            24,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            25,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            26,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            27,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            28,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            29,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            30,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            31,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ]
+        ],
+        "schema": {
+          "category": 7,
+          "column": 6,
+          "implementation": 3,
+          "innerWindowID": 2,
+          "line": 5,
+          "location": 0,
+          "optimizations": 4,
+          "relevantForJS": 1,
+          "subcategory": 8
+        }
+      },
+      "markers": {
+        "data": [],
+        "schema": {
+          "category": 4,
+          "data": 5,
+          "endTime": 2,
+          "name": 0,
+          "phase": 3,
+          "startTime": 1
+        }
+      },
+      "name": "BusyThread",
+      "pid": 7601,
+      "processType": "default",
+      "registerTime": 0,
+      "samples": {
+        "data": [
+          [
+            14,
+            83638048.442366,
+            0
+          ],
+          [
+            14,
+            83638048.483251,
+            0
+          ],
+          [
+            14,
+            83638048.502626,
+            0
+          ],
+          [
+            14,
+            83638048.522262,
+            0
+          ],
+          [
+            14,
+            83638048.539241,
+            0
+          ],
+          [
+            14,
+            83638048.558251,
+            0
+          ],
+          [
+            14,
+            83638048.57523,
+            0
+          ],
+          [
+            14,
+            83638048.593512,
+            0
+          ],
+          [
+            14,
+            83638048.610178,
+            0
+          ],
+          [
+            14,
+            83638048.62872,
+            0
+          ],
+          [
+            14,
+            83638048.645491,
+            0
+          ],
+          [
+            14,
+            83638048.66372,
+            0
+          ],
+          [
+            14,
+            83638048.68023,
+            0
+          ],
+          [
+            6,
+            83638048.735439,
+            0
+          ],
+          [
+            3,
+            83638048.888199,
+            0
+          ],
+          [
+            3,
+            83638049.11023,
+            0
+          ],
+          [
+            3,
+            83638049.350439,
+            0
+          ],
+          [
+            3,
+            83638049.594658,
+            0
+          ],
+          [
+            3,
+            83638049.839814,
+            0
+          ],
+          [
+            3,
+            83638050.085908,
+            0
+          ],
+          [
+            3,
+            83638050.33247,
+            0
+          ],
+          [
+            3,
+            83638050.581741,
+            0
+          ],
+          [
+            3,
+            83638050.82721,
+            0
+          ],
+          [
+            3,
+            83638051.074814,
+            0
+          ],
+          [
+            3,
+            83638051.323043,
+            0
+          ],
+          [
+            3,
+            83638051.571481,
+            0
+          ],
+          [
+            3,
+            83638051.82747,
+            0
+          ],
+          [
+            3,
+            83638052.074658,
+            0
+          ],
+          [
+            3,
+            83638052.321637,
+            0
+          ],
+          [
+            3,
+            83638052.569085,
+            0
+          ],
+          [
+            6,
+            83638052.822054,
+            0
+          ],
+          [
+            6,
+            83638053.209345,
+            0
+          ],
+          [
+            3,
+            83638056.655752,
+            0
+          ],
+          [
+            3,
+            83638056.861742,
+            0
+          ],
+          [
+            3,
+            83638057.071846,
+            0
+          ],
+          [
+            3,
+            83638057.300179,
+            0
+          ],
+          [
+            3,
+            83638057.615544,
+            0
+          ],
+          [
+            3,
+            83638057.799919,
+            0
+          ],
+          [
+            3,
+            83638058.105752,
+            0
+          ],
+          [
+            19,
+            83638058.418773,
+            0
+          ],
+          [
+            3,
+            83638058.646794,
+            0
+          ],
+          [
+            3,
+            83638058.866742,
+            0
+          ],
+          [
+            3,
+            83638059.140388,
+            0
+          ],
+          [
+            3,
+            83638059.315961,
+            0
+          ],
+          [
+            3,
+            83638059.540127,
+            0
+          ],
+          [
+            3,
+            83638059.777002,
+            0
+          ],
+          [
+            3,
+            83638060.123617,
+            0
+          ],
+          [
+            3,
+            83638060.264086,
+            0
+          ],
+          [
+            3,
+            83638060.521586,
+            0
+          ],
+          [
+            3,
+            83638060.750023,
+            0
+          ],
+          [
+            3,
+            83638061.001742,
+            0
+          ],
+          [
+            3,
+            83638061.298565,
+            0
+          ],
+          [
+            3,
+            83638061.51044,
+            0
+          ],
+          [
+            3,
+            83638061.766742,
+            0
+          ],
+          [
+            3,
+            83638062.019346,
+            0
+          ],
+          [
+            3,
+            83638062.271846,
+            0
+          ],
+          [
+            3,
+            83638062.523148,
+            0
+          ],
+          [
+            3,
+            83638062.785023,
+            0
+          ],
+          [
+            3,
+            83638063.034034,
+            0
+          ],
+          [
+            3,
+            83638063.278357,
+            0
+          ],
+          [
+            3,
+            83638063.52893,
+            0
+          ],
+          [
+            22,
+            83638063.948201,
+            0
+          ],
+          [
+            24,
+            83638071.922368,
+            0
+          ],
+          [
+            3,
+            83638072.241587,
+            0
+          ],
+          [
+            3,
+            83638072.398774,
+            0
+          ],
+          [
+            3,
+            83638072.633149,
+            0
+          ],
+          [
+            3,
+            83638072.883879,
+            0
+          ],
+          [
+            3,
+            83638073.136066,
+            0
+          ],
+          [
+            3,
+            83638073.388618,
+            0
+          ],
+          [
+            3,
+            83638073.642837,
+            0
+          ],
+          [
+            3,
+            83638073.893254,
+            0
+          ],
+          [
+            3,
+            83638074.14492,
+            0
+          ],
+          [
+            3,
+            83638074.396483,
+            0
+          ],
+          [
+            3,
+            83638074.647889,
+            0
+          ],
+          [
+            3,
+            83638074.899035,
+            0
+          ],
+          [
+            3,
+            83638075.155285,
+            0
+          ],
+          [
+            3,
+            83638075.425389,
+            0
+          ],
+          [
+            3,
+            83638075.694764,
+            0
+          ],
+          [
+            3,
+            83638075.961744,
+            0
+          ],
+          [
+            3,
+            83638076.226379,
+            0
+          ],
+          [
+            3,
+            83638098.803933,
+            0
+          ],
+          [
+            3,
+            83638099.057215,
+            0
+          ],
+          [
+            3,
+            83638099.316433,
+            0
+          ],
+          [
+            3,
+            83638099.57685,
+            0
+          ],
+          [
+            3,
+            83638099.83534,
+            0
+          ],
+          [
+            3,
+            83638100.092996,
+            0
+          ],
+          [
+            3,
+            83638100.349454,
+            0
+          ],
+          [
+            3,
+            83638100.605236,
+            0
+          ],
+          [
+            3,
+            83638100.859923,
+            0
+          ],
+          [
+            3,
+            83638101.11409,
+            0
+          ],
+          [
+            3,
+            83638101.367579,
+            0
+          ],
+          [
+            3,
+            83638101.620548,
+            0
+          ],
+          [
+            3,
+            83638101.879298,
+            0
+          ],
+          [
+            3,
+            83638102.139767,
+            0
+          ],
+          [
+            3,
+            83638102.400184,
+            0
+          ],
+          [
+            3,
+            83638102.659194,
+            0
+          ],
+          [
+            31,
+            83638108.426903,
+            0
+          ],
+          [
+            3,
+            83638108.624195,
+            0
+          ],
+          [
+            3,
+            83638108.830236,
+            0
+          ],
+          [
+            3,
+            83638109.044299,
+            0
+          ],
+          [
+            3,
+            83638109.264351,
+            0
+          ],
+          [
+            3,
+            83638109.488986,
+            0
+          ],
+          [
+            3,
+            83638109.717372,
+            0
+          ],
+          [
+            3,
+            83638109.949299,
+            0
+          ],
+          [
+            3,
+            83638110.184299,
+            0
+          ],
+          [
+            3,
+            83638110.420601,
+            0
+          ],
+          [
+            3,
+            83638110.659299,
+            0
+          ],
+          [
+            3,
+            83638110.899612,
+            0
+          ],
+          [
+            3,
+            83638111.141539,
+            0
+          ],
+          [
+            3,
+            83638111.38456,
+            0
+          ],
+          [
+            3,
+            83638111.62857,
+            0
+          ],
+          [
+            3,
+            83638111.880028,
+            0
+          ],
+          [
+            3,
+            83638112.125966,
+            0
+          ],
+          [
+            3,
+            83638112.371695,
+            0
+          ],
+          [
+            33,
+            83638112.619508,
+            0
+          ],
+          [
+            3,
+            83638118.801956,
+            0
+          ],
+          [
+            3,
+            83638119.044873,
+            0
+          ],
+          [
+            3,
+            83638119.261904,
+            0
+          ],
+          [
+            3,
+            83638119.480133,
+            0
+          ],
+          [
+            3,
+            83638119.702529,
+            0
+          ],
+          [
+            3,
+            83638119.928987,
+            0
+          ],
+          [
+            3,
+            83638120.158935,
+            0
+          ],
+          [
+            3,
+            83638120.391956,
+            0
+          ],
+          [
+            3,
+            83638120.627581,
+            0
+          ],
+          [
+            3,
+            83638120.865238,
+            0
+          ],
+          [
+            3,
+            83638121.104717,
+            0
+          ],
+          [
+            3,
+            83638121.345758,
+            0
+          ],
+          [
+            3,
+            83638121.588102,
+            0
+          ],
+          [
+            3,
+            83638121.838675,
+            0
+          ],
+          [
+            3,
+            83638122.091488,
+            0
+          ],
+          [
+            3,
+            83638122.3418,
+            0
+          ],
+          [
+            3,
+            83638122.592998,
+            0
+          ],
+          [
+            35,
+            83638122.846019,
+            0
+          ],
+          [
+            41,
+            83638158.461804,
+            0
+          ],
+          [
+            3,
+            83638158.665137,
+            0
+          ],
+          [
+            3,
+            83638158.896231,
+            0
+          ],
+          [
+            3,
+            83638159.133418,
+            0
+          ],
+          [
+            3,
+            83638159.373887,
+            0
+          ],
+          [
+            3,
+            83638159.616283,
+            0
+          ],
+          [
+            3,
+            83638159.859825,
+            0
+          ],
+          [
+            3,
+            83638160.105189,
+            0
+          ],
+          [
+            3,
+            83638160.349564,
+            0
+          ],
+          [
+            3,
+            83638160.59545,
+            0
+          ],
+          [
+            3,
+            83638160.842064,
+            0
+          ],
+          [
+            3,
+            83638161.089304,
+            0
+          ],
+          [
+            3,
+            83638161.336752,
+            0
+          ],
+          [
+            3,
+            83638161.584721,
+            0
+          ],
+          [
+            3,
+            83638161.840294,
+            0
+          ],
+          [
+            3,
+            83638162.087429,
+            0
+          ],
+          [
+            3,
+            83638162.334513,
+            0
+          ],
+          [
+            3,
+            83638162.582221,
+            0
+          ]
+        ],
+        "schema": {
+          "responsiveness": 2,
+          "stack": 0,
+          "time": 1
+        }
+      },
+      "stackTable": {
+        "data": [
+          [
+            null,
+            0,
+            0
+          ],
+          [
+            0,
+            1,
+            0
+          ],
+          [
+            1,
+            2,
+            0
+          ],
+          [
+            2,
+            3,
+            0
+          ],
+          [
+            3,
+            4,
+            0
+          ],
+          [
+            4,
+            4,
+            0
+          ],
+          [
+            5,
+            5,
+            0
+          ],
+          [
+            6,
+            6,
+            0
+          ],
+          [
+            7,
+            7,
+            0
+          ],
+          [
+            8,
+            8,
+            0
+          ],
+          [
+            9,
+            9,
+            0
+          ],
+          [
+            10,
+            10,
+            0
+          ],
+          [
+            11,
+            11,
+            0
+          ],
+          [
+            12,
+            12,
+            0
+          ],
+          [
+            13,
+            13,
+            0
+          ],
+          [
+            3,
+            14,
+            0
+          ],
+          [
+            15,
+            15,
+            0
+          ],
+          [
+            16,
+            16,
+            0
+          ],
+          [
+            17,
+            17,
+            0
+          ],
+          [
+            18,
+            18,
+            0
+          ],
+          [
+            7,
+            19,
+            0
+          ],
+          [
+            20,
+            20,
+            0
+          ],
+          [
+            21,
+            21,
+            0
+          ],
+          [
+            6,
+            22,
+            0
+          ],
+          [
+            23,
+            23,
+            0
+          ],
+          [
+            5,
+            14,
+            0
+          ],
+          [
+            25,
+            15,
+            0
+          ],
+          [
+            26,
+            16,
+            0
+          ],
+          [
+            27,
+            17,
+            0
+          ],
+          [
+            28,
+            24,
+            0
+          ],
+          [
+            29,
+            25,
+            0
+          ],
+          [
+            30,
+            26,
+            0
+          ],
+          [
+            11,
+            27,
+            0
+          ],
+          [
+            32,
+            28,
+            0
+          ],
+          [
+            10,
+            29,
+            0
+          ],
+          [
+            34,
+            30,
+            0
+          ],
+          [
+            6,
+            14,
+            0
+          ],
+          [
+            36,
+            15,
+            0
+          ],
+          [
+            37,
+            16,
+            0
+          ],
+          [
+            38,
+            17,
+            0
+          ],
+          [
+            39,
+            24,
+            0
+          ],
+          [
+            40,
+            31,
+            0
+          ]
+        ],
+        "schema": {
+          "category": 2,
+          "frame": 1,
+          "prefix": 0
+        }
+      },
+      "stringTable": [
+        "__start_thread (in /apex/com.android.runtime/lib64/bionic/libc.so)",
+        "__pthread_start(void*) (in /apex/com.android.runtime/lib64/bionic/libc.so)",
+        "java.lang.Thread.run (in /apex/com.android.art/javalib/core-oj.jar)",
+        "com.android.simpleperf.debuggable.MainActivity$1.run (in /data/app/~~76MchZRJTLK3KXJaRL_qxg==/com.android.simpleperf.debuggable-1oSYM04VyxVPlD5eh3eJsg==/oat/arm64/base.vdex)",
+        "java.lang.Thread.sleep (in [JIT app cache])",
+        "art::Monitor::Wait(art::Thread*, art::ObjPtr<art::mirror::Object>, long, int, bool, art::ThreadState) (in /apex/com.android.art/lib64/libart.so)",
+        "syscall (in /apex/com.android.runtime/lib64/bionic/libc.so)",
+        "[kernel.kallsyms][+ffffff93eb484156] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb64c252] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb645bee] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb647ffa] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb64ab86] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93ed05e93e] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb58b094] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb483f36] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb481f72] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb5f1b6a] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb5424a6] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb4820f4] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb484126] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb502696] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb6942fc] (in [kernel.kallsyms])",
+        "__set_errno_internal (in /apex/com.android.runtime/lib64/bionic/libc.so)",
+        "@plt (in /apex/com.android.runtime/lib64/bionic/libc.so)",
+        "[kernel.kallsyms][+ffffff93eb482226] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb6188c2] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb611850] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb64aab2] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93ed04df40] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb647f66] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb623780] (in [kernel.kallsyms])",
+        "[kernel.kallsyms][+ffffff93eb62322c] (in [kernel.kallsyms])"
+      ],
+      "tid": 7630,
+      "unregisterTime": null
+    }
+  ]
+}
diff --git a/test/testdata/perf_with_tracepoint_event.gecko.json b/test/testdata/perf_with_tracepoint_event.gecko.json
new file mode 100644
index 0000000..2f5a926
--- /dev/null
+++ b/test/testdata/perf_with_tracepoint_event.gecko.json
@@ -0,0 +1,549 @@
+{
+  "libs": [],
+  "meta": {
+    "abi": "aarch64",
+    "asyncstack": 1,
+    "categories": [
+      {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "orange",
+        "name": "Kernel",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "yellow",
+        "name": "Native",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "DEX",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "OAT",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "blue",
+        "name": "Off-CPU",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": [
+          "Other"
+        ]
+      },
+      {
+        "color": "green",
+        "name": "JIT",
+        "subcategories": [
+          "Other"
+        ]
+      }
+    ],
+    "debug": 0,
+    "device": "Google:Pixel 2:walleye",
+    "gcpoison": 0,
+    "interval": 1,
+    "markerSchema": [],
+    "oscpu": null,
+    "platform": null,
+    "presymbolicated": true,
+    "processType": 0,
+    "product": "/data/local/tmp/simpleperf record -e sched:sched_switch -e cpu-cycles sleep 1",
+    "shutdownTime": null,
+    "stackwalk": 1,
+    "startTime": 1512941771000,
+    "version": 24
+  },
+  "pausedRanges": [],
+  "processes": [],
+  "threads": [
+    {
+      "frameTable": {
+        "data": [
+          [
+            0,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            1,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            2,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            5,
+            0
+          ],
+          [
+            3,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            4,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            5,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            6,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            7,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            8,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            9,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ],
+          [
+            10,
+            false,
+            0,
+            null,
+            null,
+            null,
+            null,
+            1,
+            0
+          ]
+        ],
+        "schema": {
+          "category": 7,
+          "column": 6,
+          "implementation": 3,
+          "innerWindowID": 2,
+          "line": 5,
+          "location": 0,
+          "optimizations": 4,
+          "relevantForJS": 1,
+          "subcategory": 8
+        }
+      },
+      "markers": {
+        "data": [],
+        "schema": {
+          "category": 4,
+          "data": 5,
+          "endTime": 2,
+          "name": 0,
+          "phase": 3,
+          "startTime": 1
+        }
+      },
+      "name": "sleep",
+      "pid": 9896,
+      "processType": "default",
+      "registerTime": 0,
+      "samples": {
+        "data": [
+          [
+            0,
+            536732415.65594,
+            0
+          ],
+          [
+            1,
+            536732415.663024,
+            0
+          ],
+          [
+            2,
+            536732415.855628,
+            0
+          ],
+          [
+            3,
+            536732416.562399,
+            0
+          ],
+          [
+            2,
+            536732416.922451,
+            0
+          ],
+          [
+            4,
+            536732418.120784,
+            0
+          ],
+          [
+            2,
+            536732418.371201,
+            0
+          ],
+          [
+            5,
+            536732419.142503,
+            0
+          ],
+          [
+            5,
+            536732419.14969,
+            0
+          ],
+          [
+            2,
+            536732419.966826,
+            0
+          ],
+          [
+            6,
+            536732420.235419,
+            0
+          ],
+          [
+            2,
+            536732420.924794,
+            0
+          ],
+          [
+            7,
+            536732421.171461,
+            0
+          ],
+          [
+            2,
+            536732421.250211,
+            0
+          ],
+          [
+            4,
+            536732421.445836,
+            0
+          ],
+          [
+            2,
+            536732421.544899,
+            0
+          ],
+          [
+            7,
+            536732421.800888,
+            0
+          ],
+          [
+            8,
+            536732421.836878,
+            0
+          ],
+          [
+            9,
+            536732421.841878,
+            0
+          ],
+          [
+            2,
+            536732421.87318,
+            0
+          ],
+          [
+            2,
+            536732421.900315,
+            0
+          ],
+          [
+            5,
+            536732422.094638,
+            0
+          ],
+          [
+            2,
+            536732422.188128,
+            0
+          ],
+          [
+            2,
+            536732422.43094,
+            0
+          ],
+          [
+            2,
+            536732422.702972,
+            0
+          ],
+          [
+            2,
+            536732423.006357,
+            0
+          ],
+          [
+            2,
+            536732423.138076,
+            0
+          ],
+          [
+            2,
+            536732423.500628,
+            0
+          ],
+          [
+            2,
+            536732423.76943,
+            0
+          ],
+          [
+            2,
+            536732425.676201,
+            0
+          ],
+          [
+            2,
+            536732426.086722,
+            0
+          ],
+          [
+            2,
+            536732426.35693,
+            0
+          ],
+          [
+            2,
+            536732426.801513,
+            0
+          ],
+          [
+            2,
+            536732426.916774,
+            0
+          ],
+          [
+            2,
+            536732427.020263,
+            0
+          ],
+          [
+            2,
+            536732427.455524,
+            0
+          ],
+          [
+            2,
+            536732428.163961,
+            0
+          ],
+          [
+            2,
+            536732428.383753,
+            0
+          ],
+          [
+            2,
+            536732428.868284,
+            0
+          ],
+          [
+            2,
+            536732429.336982,
+            0
+          ],
+          [
+            2,
+            536732429.894222,
+            0
+          ],
+          [
+            2,
+            536732430.261357,
+            0
+          ],
+          [
+            10,
+            536732430.486097,
+            0
+          ],
+          [
+            2,
+            536732433.741565,
+            0
+          ],
+          [
+            2,
+            536732434.293857,
+            0
+          ]
+        ],
+        "schema": {
+          "responsiveness": 2,
+          "stack": 0,
+          "time": 1
+        }
+      },
+      "stackTable": {
+        "data": [
+          [
+            null,
+            0,
+            0
+          ],
+          [
+            null,
+            1,
+            0
+          ],
+          [
+            null,
+            2,
+            0
+          ],
+          [
+            null,
+            3,
+            0
+          ],
+          [
+            null,
+            4,
+            0
+          ],
+          [
+            null,
+            5,
+            0
+          ],
+          [
+            null,
+            6,
+            0
+          ],
+          [
+            null,
+            7,
+            0
+          ],
+          [
+            null,
+            8,
+            0
+          ],
+          [
+            null,
+            9,
+            0
+          ],
+          [
+            null,
+            10,
+            0
+          ]
+        ],
+        "schema": {
+          "category": 2,
+          "frame": 1,
+          "prefix": 0
+        }
+      },
+      "stringTable": [
+        "perf_event_exec (in [kernel.kallsyms])",
+        "memcpy (in [kernel.kallsyms])",
+        "__schedule (in [kernel.kallsyms])",
+        "schedule_timeout (in [kernel.kallsyms])",
+        "filemap_fault (in [kernel.kallsyms])",
+        "_raw_spin_unlock_irq (in [kernel.kallsyms])",
+        "__wait_on_bit_lock (in [kernel.kallsyms])",
+        "generic_file_read_iter (in [kernel.kallsyms])",
+        "__do_softirq (in [kernel.kallsyms])",
+        "_raw_spin_unlock_irqrestore (in [kernel.kallsyms])",
+        "__clean_dcache_area_pou (in [kernel.kallsyms])"
+      ],
+      "tid": 9896,
+      "unregisterTime": null
+    }
+  ]
+}
diff --git a/test/tools_test.py b/test/tools_test.py
index 9c9fbd7..ad1a23b 100644
--- a/test/tools_test.py
+++ b/test/tools_test.py
@@ -207,7 +207,7 @@ system/extras/simpleperf/runtest/two_functions.cpp:21:3
                 'expected_items': [
                     ('main', 0),
                     ('two_functions.cpp:20', 0),
-                    ('1134:      	add	x29, sp, #16', 0x1134),
+                    ('1134:      	add	x29, sp, #0x10', 0x1134),
                 ],
             },
             '/simpleperf_runtest_two_functions_arm': {
@@ -225,7 +225,7 @@ system/extras/simpleperf/runtest/two_functions.cpp:21:3
                 'expected_items': [
                     ('main', 0),
                     ('two_functions.cpp:20', 0),
-                    (r'19f0:      	movl	%eax, 9314(%rip)', 0x19f0),
+                    (r'19f0:      	movl	%eax, 0x2462(%rip)', 0x19f0),
                 ],
             },
             '/simpleperf_runtest_two_functions_x86': {
@@ -234,7 +234,7 @@ system/extras/simpleperf/runtest/two_functions.cpp:21:3
                 'expected_items': [
                     ('main', 0),
                     ('two_functions.cpp:20', 0),
-                    (r'16f7:      	cmpl	$100000000, %ecx', 0x16f7),
+                    (r'16f7:      	cmpl	$0x5f5e100, %ecx', 0x16f7),
                 ],
             },
         }
diff --git a/update.py b/update.py
index 7a0de88..bff6aa7 100755
--- a/update.py
+++ b/update.py
@@ -202,7 +202,7 @@ def unzip_simpleperf_scripts(zip_path: str):
 
     # Move scripts.
     for sub_path in Path('scripts').iterdir():
-        if sub_path.name not in ['bin', 'pylintrc', 'update.py']:
+        if sub_path.name not in ['bin', 'pylintrc', 'update.py', 'Android.bp']:
             shutil.move(sub_path, '.')
     remove('scripts')
     remove('inferno/Android.bp')