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

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