8150203: Incremental update from build-infra project

Reviewed-by: erikj
6 files changed