Merge "FVP: Fix plat_set_nv_ctr() function" into integration