Merge "FVP: Remove re-definition of topology related build options" into integration