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

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