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

Change-Id: I4833d1d4efc4e8783c87a1fc632cdd89038ce59c