Merge "lpdump: Allow reading local partition images." am: 82f21a000d
am: 6560cc1a2a

Change-Id: I1e8cf8366178d8fcb7e8da4a5d0da843d88ebb71