Merge "fix(bl31): allow use of EHF with S-EL2 SPMC" into integration