MERGE: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name