Several tests do not compile on armv7hl. Backport a fix that addresses this from upstream (they were made after the 2.0 release). Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
