build: darwin/arm builders broken by content-based build CL #22509
Description
Looks like I broke the darwin/arm builders with my CL 73212. Investigating.
The log at https://build.golang.org/log/83cd0cb12afd4ff5069c6a9a72b124e02d21127c makes it look like there are two different make.bash runs, which maybe is part of the problem.
/cc @eliasnaur @crawshaw