Merge "libblkid: fix buffer overflow scanning partition name" am: 0474c47c22
am: ff35b76641

Change-Id: I16fc2fe2ad37cec0fb7c20376d6bc285c0020eff