Merge "Update deapexer call to explictly use blkid" am: da42e6fe

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



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