Merge "Modify FVP makefile for cores that support both AArch64/32" into integration