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

This reverts commit f15df5bbbf3757af9e511369fc2a73c104850192.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ffha sub directory