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