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

Change-Id: I1448c90d706a5e2ba0b69c90c11433b047097ddf