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

Merge commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4'

* commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4':
  vold: Add support for /dev/block/mmcblk1