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

This reverts commit 8dcaa78f817da6469d45dad79d97c589f9396584.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ffha sub directory