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

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