am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"

* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu