am 18ddf41d: Merge "Add x86 qemu"

* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu