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

Change-Id: I21e4bacb8c206656c41221d2ca4ff60021dca48c