Merge pull request #1108 from sandrine-bailleux-arm/sb/fvp-utils-def

FVP: Include utils_def.h instead of utils.h