Merge "Switch check_targetfiles_vintf to use the correct blkid binary." am:...

Merge "Switch check_targetfiles_vintf to use the correct blkid binary." am: 9f63b290 am: f5ef9905

Original change: https://android-review.googlesource.com/c/platform/build/+/2395620



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