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

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