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

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