Merge "fix(fvp): op-tee sp manifest doesn't map gicd" into integration