Merge "Fix a bug in run_tool_with_logging script" into main am: 1c51c141 am: 83057de6

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



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