Merge "Revert "sdk: copy system-qemu.img to system-images.zip"" am: 63933a13 am: 80ad2a7a am: dc93336a am: 43e14c19 Change-Id: I4945f650cfc089446003c5d52091c3cb0ebcd59d