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

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