Merge "Fix test flake" am: 59f99b31eb

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

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

tools/releasetools/common.py

@@ -1424,9 +1424,10 @@ def ResolveAVBSigningPathArgs(split_args):
   def ResolveBinaryPath(path):
     if os.path.exists(path):
       return path
-    new_path = os.path.join(OPTIONS.search_path, path)
-    if os.path.exists(new_path):
-      return new_path
+    if OPTIONS.search_path:
+      new_path = os.path.join(OPTIONS.search_path, path)
+      if os.path.exists(new_path):
+        return new_path
     raise ExternalError(
         "Failed to find {}".format(new_path))