Merge "Use command instead of which to locate/run adb" into main am:...

Merge "Use command instead of which to locate/run adb" into main am: 9c777ce8 am: 8e8c7980 am: c003628d am: 52641fb6 am: 054c55cd

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



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