Merge "sdk: copy system-qemu.img to system-images.zip"
am: 5fdb50ef7a

Change-Id: I229d6a7e902c7d934027050090976fe9f6dc34b8