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

This reverts commit 53959b0ee1b39872b79ae8d4587df3d778c0ab69.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/ffha sub directory