Merge "Fix alignment of buffer used for dm_ioctl."