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

Change-Id: I9a48c1807c6d491e210b562ea32e7dd965d7f967