Merge "emulator: package ramdisk-qemu.img to image zip" am: 62b3edb5ea

Change-Id: I22b9612eda9510222824c5da6722ef5ce71ea9e7