Merge "libdm: Clean up error messages and dm_ioctl use." am: 9a2891c84b
am: 1e411be840

Change-Id: I56382dab660ceebf6f422c3820fd4e024eaa1f65