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

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