Hack compatibility for Shape refactorings.

Shape::mVizMesh was moved into ShapeMesh.
Merge branch 'master' into shape-refactoring-option2
Merge branch 'master' into shape-refactoring-option2