MERGE: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch