Revert "removing some algs due to patent concerns, and rearranging"

This reverts commit 89a3e29ba40131644cb4b11165e2b2436be50f59.

This change has broken Solaris 9 and 10 builds.
Merge branch 'fix-solaris-builds'