Merge "Fix simulator build again."