Fix architecture used for RPM packages and DEB/RPM package file names.
Merge remote-tracking branch 'google/hotfix/rpm-package-architecture'