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

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