Merge "spm-mm: correcting instructions to build SPM for FVP" into integration