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

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