ams and clk fixes #23499

Job	Run time
LP64-WIP	3m 42s
manifest-check	2m 37s
build-windows (mnfst, imx8 imx8x)	10m 16s
build-windows (mnfst, lnl)	8m 49s
build-windows (mnfst, tgl-h)	8m 11s
build-windows (mnfst, tgl)	9m 48s
build-windows (mnfst, mtl)	8m 18s
build-linux (mnfst, wcl imx95)	6m 49s
build-linux (mnfst, lnl)	4m 33s
build-linux (mnfst, imx8m imx8ulp)	4m 59s
build-linux (mnfst, tgl)	4m 21s
build-linux (-d, mnfst, lnl)	4m 18s
build-linux (mnfst, tgl-h)	4m 15s
build-linux (mnfst, imx8 imx8x)	4m 57s
build-windows (mnfst, ptl)	10m 5s
build-linux (mnfst, ptl)	5m 41s
build-windows (mnfst, imx8m imx8ulp)	10m 23s
build-linux (mnfst, mtl)	4m 28s
build-windows (-d, mnfst, lnl)	10m 1s
compare-linux-win	26s
	2h 6m 57s

Provide feedback