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

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