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

This reverts commit 62ed9d0d81e4a257da8cc6f08c0ffd5d486ac442.
Rebase from 'upstream'
Trimmed the branch to only the 3rdparty/ffha sub directory