Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe am: e91c2686e9
am: d26cb98c4d

Change-Id: Ie6988c9cdf17a1f36a4f9aa59544ba5f461d825b