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

Change-Id: I5f30b663990c0e00b9d5f8fc4c66d47cda17c1d3