...to reduce the diff between the cl21_trunk and cl22_trunk branches. Signed-off-by: Kevin Petit <kevin.petit@arm.com>