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

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