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

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