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

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