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

Change-Id: Icbee7239f8bd525af63cf5036b0602c18f8cc2b5