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

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