Merge "Support emulator's virtio-blk based SD card" into nyc-dev