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

Change-Id: I3f688d10bb76327bff92a5995944b2511ff4b0f3