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

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