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

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