Merge "partition_tools: Update for auto-slot-suffixing." am: ef055adc78
am: c960f90ae9

Change-Id: I8024997b92710c5a8ed0faa26c0f1ad63ddd75d7