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

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