Merge "partition_tools: Use the new liblp header layout."