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

Change-Id: Ideeb099a64e45217b994530973da05dbe2da0e3c