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

Change-Id: I64ced357843629dd2716cb95d6f06e95fa061296