Revert "Remove the use of dpkg-architecture."

This reverts commit f63e7730eecfcb9936572937656982d20f35b2a5.