Revert "Trimmed the branch to only the 3rdparty/ff sub directory"

This reverts commit d3b233599abc0bac6e4cb9c4e841ba480ddebfde.
Rebase from 'upstream'
Trimmed the branch to only the 3rdparty/ff sub directory