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

Change-Id: If4b425d184c070830570332ecc6137ed4deb458d