Merge "partition_tools: Update lpdump for metadata format changes." am: 82ef966412
am: b8f42e4459

Change-Id: I690b75d0b0325d992b6819adc9c8a5a9b71e1a64