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

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