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

Change-Id: I90f297d94449748fbaf5794b38d5b1e23bb0b0de