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

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

Change-Id: Ifd71eceaf1ad8c005c6e1b17cabdd17f5e5c415f