Merge "partition_tools: Remove references to partition guid." am: 89841b593e am: 9f6db8175b
am: 98687cfa88

Change-Id: Ib4e67df69bd7bb886cd1ac6ad0a692465519ebda