[packages,*] Another attempt at cleaning up the valid architectures for Xcode builds