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

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