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