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

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