Merging 32 commit(s) from Chromium's toolchain-utils am: 7bc245bad9 am: 6323407a0d am: 38574f5e98 am: cfc899b239

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

Change-Id: I1a093ad26060edd9fd26476d0d5d3afff274306a