Merge "Revert "Revert "sdk: copy system-qemu.img to system-images.zip""" am: 89b9d429 am: bb5235d4 am: a0fae08d am: c3172078 Change-Id: I1f27257ae994c52f0f3e090ca8b9b72edc0fc6db