Merge "libdm: Improve the reliability of dm device paths."
am: c9b797ac25

Change-Id: I30a3bf89f71269b0072dad4f73e6b74273ea031a