Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain."