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

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