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

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