Merge "Fix signapk not found error when running ota_from_target_files locally"...

Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e am: 6f017f5e am: 203b1920 am: e7050a1e

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

Change-Id: Ia5a9c22f62953a4d7fb414a5b0a3ba91d3857674