Merge "partition_tools: Update for multiple block device support."
am: cf4a68ce42

Change-Id: Ibc1db6262f307716fbb630cf33bc276656311004