Merge "fix(errata_abi): update EM_HIGHER_EL_MITIGATION to avoid failure"