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

Change-Id: Ibfb8ce8dc840b6dbaf22bbae13060191b02e6b8f