Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev
am: 828d386c7d

* commit '828d386c7de04c6f33c1e998fd9d4630f90d5be4':
  Support emulator's virtio-blk based SD card