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

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