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

Change-Id: I330231a6e2ad08a27a46705eab56dbc89b2f8dbf