Merge "Remove --blkid_path argument" am: 6e5a621120

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2624312

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