Merging 25 commit(s) from Chromium's toolchain-utils am: 9090b1a17b am: c9cb1157f1 am: 8a12172a24 am: 178e686da3 am: 882a18888f

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

Change-Id: Icc858b89886afca3f6fa22b09849657fceea9adc