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

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