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

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