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

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