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

Change-Id: Ic3e89748888e62a197fe7cf620e1a3b2d9e3f9b9