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

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