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

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