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

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