Merge "refactor(fvp_r): remove unused files and clean up makefiles" into integration