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

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