am 3afe20b0: vold: Add support for /dev/block/mmcblk1

Merge commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce' into eclair-plus-aosp

* commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce':
  vold: Add support for /dev/block/mmcblk1