Merge "Fix simulator build."