Merging 2 commit(s) from Chromium's toolchain-utils am: b8e15db276 am: 06d9af65e4 am: 524e03e040

Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1343843

Change-Id: I4f9373727dd288eae2afc1bb49fba6af6c5eb618