Merge "libdm: Make ExtractBlockDeviceName() return its result" into sc-dev