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

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