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

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