Merge "Replace manual dm ioctls with libdm." am: bc5818774c
am: f1fa57d602

Change-Id: I8f49bf924272195c6ae2e827cfb78766d644d154