Converted convex_hull to the multi-stage approach and made it variant-aware.

[SVN r86401]