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

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