Fix upstream sync (again) #4741

Job	Run time
no-labels	1s
ci-ready-to-merge	3s
ci-run	1s
ci-run-full	1s
call-hexagon / Hexagon Build Test (presubmit)	8m 47s
call-ci / Bazel (presubmit)	16m 33s
call-ci / Bazel msan (presubmit)	14m 57s
call-ci / Bazel with Compression (presubmit)	16m 36s
call-ci / Bazel with Compression [msan] (presubmit)	14m 53s
call-ci / Bazel asan (presubmit)	15m 9s
call-ci / Bazel with Compression [asan] (presubmit)	14m 51s
call-ci / Cortex-M Bluepill No Release (presubmit)	8m 12s
call-ci / Cortex-M Bluepill Release (presubmit)	7m 12s
call-ci / Cortex-M Bluepill Renode (presubmit)	4m 8s
call-ci / Cortex-M QEMU Unit Tests (presubmit)	8m 37s
call-ci / Code Style (presubmit)	1m 9s
call-ci / Project Generation (presubmit)	9m 48s
call-check-tflite-files / Check PR Modifies TfLite Files	35s
call-ci / Makefile x86 Release (presubmit)	11m 33s
call-ci / Makefile x86 Default (presubmit)	7m 4s
call-ci / Makefile x86 with Compression (presubmit)	6m 26s
call-ci / Makefile x86 No TFLite Static Memory (presubmit)	5m 34s
call-ci / Makefile x86 Out Of Tree (presubmit)	3m 30s
call-xtensa-presubmit / Hifi5 Unit Tests (presubmit)	19m 30s
call-xtensa-presubmit / Vision P6 Build (presubmit)	11m 59s
call-xtensa-presubmit / Hifi5 Unit Tests with Compression (presubmit)	21m 44s
call-xtensa-presubmit / Hifi3z Unit Tests (presubmit)	22m 55s
call-xtensa-presubmit / Hifi3z Unit Tests with Compression (presubmit)	25m 5s
PR has Bug	1s
	4h 36m 54s

Provide feedback