Merge "fix(plat/imx/imx8m/imx8mm): fix FTBFS on SPD=opteed" into integration