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

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