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

Change-Id: I7da698060d12b9b098ccac64a52707583201a7ca