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

Change-Id: I585749bae8d30931a164b5f2a7900fea2fe1aa29