Merge "fix(spmd): revert workaround hafnium as hypervisor" into integration