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

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