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

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