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

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