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

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