Merge "lpdump: print partitions in super in order" am: 16e39c46b8
am: 5baa4d980c

Change-Id: Iaa5ebb3d094d77d36b8cff1b1ba2c8b7e5317719