Revert "packaging: Fixed building RPMs on non-x86_64 architectures"

This reverts commit 35a5b5f5e6d6c240ef1d20904bc06498b0ed81e1

Change-Id: I3525c76f7b501836a0b1a1e507ac4d8b91a637df