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

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



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