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

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