arm-bsp/fvp: move the fvp include file to the include directory

Move the FVP include file to the include directory, matching what is
done for corstone1000 and other machines in meta-arm-bsp.

Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/conf/machine/fvp-base-arm32.conf

@@ -4,7 +4,7 @@
 #@NAME: Armv7-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv7-A Base Platform FVP model
 
-require conf/machine/fvp-common.inc
+require conf/machine/include/fvp-common.inc
 require conf/machine/include/arm/arch-armv7a.inc
 
 # FVP u-boot configuration

meta-arm-bsp/conf/machine/fvp-base.conf

@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common.inc
+require conf/machine/include/fvp-common.inc
 require conf/machine/include/arm/arch-armv8a.inc
 
 TUNE_FEATURES = "aarch64"