[automerger skipped] Replace blkid with blkid_static am: 4ed44a7c76 -s ours

am skip reason: Merged-In I66078f86bd7b7c3a929543520a65dba4a4f0b2cc with SHA-1 25fce71b19 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/20637698

Change-Id: Ia96b58a5389462f64363c8c5eda7204501d7d20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>