Merge "liblp: Split super.img for retrofit devices." am: 3f814c8370
am: d29176d3fa

Change-Id: I25adfb5a7216c6768f9e7e39b1fcb00ddc3bd16c