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

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