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

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