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

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