Reapply fmt::merge change
Reapply VFS change
PARAM.SFO path change
Trophy.trp path change
Merge pull request #914 from raven02/patch-1

RSX : Reapply fmt::merge change & VFS change