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

Change-Id: I73792fe9960c85d9ef273956c41774f7b6ef57d8