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

Change-Id: I164931b642abbc79725e780cbd400a6131c4c8cd