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