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

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