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

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