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

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