Merge "fix(plat): remove fvp_r" into integration