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

Change-Id: I122084c2652b2a1924f0de5a225be186959c8d6e