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

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