Merge "fix: resolve static-check issues in smccc_arch_soc_id test"