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

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