Merge "plat/arm: Move defines to platform specific header file"