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

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

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