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

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