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

Change-Id: Ia9021b240b97fef1cf71a11bc05c2a72b2025e00