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

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