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

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