Merge "liblp: Try to merge extents during partition resizes." am: b0c9318493 am: 8660f5a85c
am: d259fa4ff2

Change-Id: I05f950acf049ffc0dec4546181c022438c1b98ce