Merge "don't rename 32-bit packages to *_32"