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

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