Merge pull request #1558 from jenswi-linaro/qemu-update

Qemu updates