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

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