Merge "Fix the simulator build."