Fix ZAP CI.

[bzbarsky-apple]

Another merge conflict.

Problem

ZAP CI failing.

Change overview

Regen.

Testing

Should pass CI now.

[github-actions]

PR #15372: Size comparison from 0e027df to 03bdce0

Full report (32 builds for cyw30739, efr32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)

platform	target	config	section	0e027df	03bdce0	change	% change
cyw30739	light	cyw930739m2evb_01	(read/write)	599502	599502	0	0.0
			.app_xip_area	503436	503436	0	0.0
			.bss	78764	78764	0	0.0
			.data	644	644	0	0.0
			.rodata	0	0	0	0.0
			.text	0	0	0	0.0
	lock	cyw930739m2evb_01	(read/write)	557538	557538	0	0.0
			.app_xip_area	463016	463016	0	0.0
			.bss	77260	77260	0	0.0
			.data	608	608	0	0.0
			.rodata	0	0	0	0.0
			.text	0	0	0	0.0
	ota-requestor	cyw930739m2evb_01	(read/write)	578774	578774	0	0.0
			.app_xip_area	474828	474828	0	0.0
			.bss	86356	86356	0	0.0
			.data	552	552	0	0.0
			.rodata	0	0	0	0.0
			.text	112	112	0	0.0
efr32	lighting-app	BRD4161A	(read only)	916484	916484	0	0.0
			(read/write)	129500	129500	0	0.0
			.bss	127464	127464	0	0.0
			.data	2036	2036	0	0.0
			.text	916476	916476	0	0.0
		BRD4161A+rpc	(read only)	945192	945192	0	0.0
			(read/write)	146416	146416	0	0.0
			.bss	144240	144240	0	0.0
			.data	2176	2176	0	0.0
			.text	945184	945184	0	0.0
	window-app	BRD4161A	(read only)	850304	850304	0	0.0
			(read/write)	127416	127416	0	0.0
			.bss	125512	125512	0	0.0
			.data	1904	1904	0	0.0
			.text	850296	850296	0	0.0
k32w	light	k32w061+release	(read/write)	692692	692692	0	0.0
			.bss	78384	78384	0	0.0
			.data	1912	1912	0	0.0
			.text	606596	606596	0	0.0
	lock	k32w061+release	(read/write)	695256	695256	0	0.0
			.bss	78600	78600	0	0.0
			.data	1952	1952	0	0.0
			.text	608904	608904	0	0.0
linux	chip-tool-ipv6only	arm64	(read only)	8781772	8781772	0	0.0
			(read/write)	432641	432641	0	0.0
			.bss	58977	58977	0	0.0
			.data	1216	1216	0	0.0
			.data.rel.ro	317776	317776	0	0.0
			.dynamic	560	560	0	0.0
			.got	50880	50880	0	0.0
			.init	24	24	0	0.0
			.init_array	200	200	0	0.0
			.rodata	454596	454596	0	0.0
			.text	7412804	7412804	0	0.0
	thermostat-no-ble	arm64	(read only)	2167740	2167740	0	0.0
			(read/write)	151137	151137	0	0.0
			.bss	67521	67521	0	0.0
			.data	1032	1032	0	0.0
			.data.rel.ro	75384	75384	0	0.0
			.dynamic	560	560	0	0.0
			.got	4216	4216	0	0.0
			.init	24	24	0	0.0
			.init_array	336	336	0	0.0
			.rodata	134060	134060	0	0.0
			.text	1814240	1814240	0	0.0
mbed	all-clusters-app	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	2430660	2430660	0	0.0
			.bss	194564	194564	0	0.0
			.data	5328	5328	0	0.0
			.text	1393232	1393232	0	0.0
	lighting-app	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	2392780	2392780	0	0.0
			.bss	188432	188432	0	0.0
			.data	5632	5632	0	0.0
			.text	1355352	1355352	0	0.0
	lock-app	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	2328224	2328224	0	0.0
			.bss	187432	187432	0	0.0
			.data	5608	5608	0	0.0
			.text	1290824	1290824	0	0.0
	pigweed-app	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	1139840	1139840	0	0.0
			.bss	11796	11796	0	0.0
			.data	4368	4368	0	0.0
			.text	103224	103224	0	0.0
	shell	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	2319124	2319124	0	0.0
			.bss	185980	185980	0	0.0
			.data	5440	5440	0	0.0
			.text	1281696	1281696	0	0.0
nrfconnect	lighting-app	nrf52840dk_nrf52840	(read/write)	1023579	1023579	0	0.0
			bss	123528	123528	0	0.0
			rodata	120984	120984	0	0.0
			text	700044	700044	0	0.0
		nrf52840dk_nrf52840+rpc	(read/write)	992891	992891	0	0.0
			bss	120716	120716	0	0.0
			rodata	112528	112528	0	0.0
			text	679948	679948	0	0.0
		nrf52840dongle_nrf52840	(read/write)	1038335	1038335	0	0.0
			bss	124748	124748	0	0.0
			rodata	119816	119816	0	0.0
			text	703856	703856	0	0.0
		nrf5340dk_nrf5340_cpuapp	(read/write)	930190	930190	0	0.0
			bss	120088	120088	0	0.0
			rodata	114240	114240	0	0.0
			text	615072	615072	0	0.0
	lock-app	nrf52840dk_nrf52840	(read/write)	952343	952343	0	0.0
			bss	121756	121756	0	0.0
			rodata	109820	109820	0	0.0
			text	642160	642160	0	0.0
		nrf5340dk_nrf5340_cpuapp	(read/write)	859822	859822	0	0.0
			bss	118348	118348	0	0.0
			rodata	102992	102992	0	0.0
			text	557964	557964	0	0.0
	pigweed-app	nrf52840dk_nrf52840	(read/write)	527595	527595	0	0.0
			bss	53632	53632	0	0.0
			rodata	49976	49976	0	0.0
			text	361016	361016	0	0.0
	pump-app	nrf52840dk_nrf52840	(read/write)	950919	950919	0	0.0
			bss	121476	121476	0	0.0
			rodata	108772	108772	0	0.0
			text	641980	641980	0	0.0
	pump-controller-app	nrf52840dk_nrf52840	(read/write)	946867	946867	0	0.0
			bss	121480	121480	0	0.0
			rodata	108472	108472	0	0.0
			text	638220	638220	0	0.0
	shell	nrf52840dk_nrf52840	(read/write)	811543	811543	0	0.0
			bss	113324	113324	0	0.0
			rodata	79756	79756	0	0.0
			text	540812	540812	0	0.0
p6	all-clusters-app	default	(read/write)	2489048	2489048	0	0.0
			.bss	122872	122872	0	0.0
			.data	2672	2672	0	0.0
			.text	1447312	1447312	0	0.0
	light-app	default	(read/write)	2394600	2394600	0	0.0
			.bss	113896	113896	0	0.0
			.data	2528	2528	0	0.0
			.text	1352864	1352864	0	0.0
	lock-app	default	(read/write)	2358176	2358176	0	0.0
			.bss	113648	113648	0	0.0
			.data	2488	2488	0	0.0
			.text	1316440	1316440	0	0.0
qpg	lighting-app	qpg6105+debug	(read only)	600348	600348	0	0.0
			(read/write)	146940	146940	0	0.0
			.bss	90944	90944	0	0.0
			.data	1112	1112	0	0.0
			.text	595028	595028	0	0.0
	lock-app	qpg6105+debug	(read only)	566108	566108	0	0.0
			(read/write)	146940	146940	0	0.0
			.bss	90952	90952	0	0.0
			.data	1064	1064	0	0.0
			.text	560788	560788	0	0.0
	persistent-storage-app	qpg6105+debug	(read only)	99536	99536	0	0.0
			(read/write)	146941	146941	0	0.0
			.bss	24001	24001	0	0.0
			.data	180	180	0	0.0
			.text	94216	94216	0	0.0
telink	lighting-app	tlsr9518adk80d	(read/write)	878766	878766	0	0.0
			bss	87500	87500	0	0.0
			noinit	37160	37160	0	0.0
			text	618928	618928	0	0.0