tc2/hafnium: fix/clean patches following rebase of component

This commit contains the changes performed as cleanup/fix of
patches necessary after rebasing Hafnium hypervisor SW
component to its latest upstream commit (as of this moment).

Signed-off-by: Sergio Alves <sergio.dasilvalves@arm.com>