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

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