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

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