Merge "fix(spmd): relax use of EHF with SPMC at S-EL2" into integration