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

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