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

Change-Id: I6c73011bd0dcc568c2fcbbb60a320b1dc9bea0ea