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

Change-Id: I6cde5e72548392c05cb1fafe1bc537ab40eb632c