Merge "liblp: MetadataBuilder::HasBlockDevice" am: 6af857f21d am: 09059679da
am: 11361f33ae

Change-Id: I61e6600b8e9c86d5b1613c016c0fe13833658261