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

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