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

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