Merge "Remove --blkid_path argument" am: e4635b3e am: 4941f6fd am: da705680 am: db9d2f09

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



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