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

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