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

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