Merge "Try with search_path for some avb path args" am: b7a45ea1 am: 56c66e00

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



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