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

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