Fix architecture filter.

If we are using uname to collect the name of the architecture, we need
to filter its output to make it consistent with dpkg. This is now
happening in the right place to avoid a spurious warning on i386 builds.

Change-Id: Iae80dbfb757fc068155730686841c742acb7a6a2
Revert "Improve Fedora build host support."

This reverts commit 591059ffd3ba406c4af010bacb07cbaf890c1500.

Change-Id: I8ad5bde2eabe12c6575d51e7443d9b46521c0928
Merge "Fix architecture filter."