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

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

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



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