Instead of having separate x86_64 and arm64 macos builds, we merge the
two builds to create an universal build, using the unify.py script from
Mozilla.

We also start renaming osx64 to macos for #40067.