Qais Yousef authored Feb 25, 2020 and Ionela Voinescu committed Aug 02, 2021

We need to support both old and new version of the struct.

Signed-off-by: Qais Yousef <qais.yousef@arm.com>