intel: Use common CONCAT/PASTE macros

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
230 jobs for !16945 with concat-paste-macros in 10 seconds (queued for 19 seconds)
latest merge request