[autoroll] More fixes for CAS -> recipes-py roller
[autoroll] More fixes for CAS -> recipes-py roller

Bug: skia:12131
Change-Id: I3fd9b7037d630c383e5cb0fd2f5cd841a576d649
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/420782
Reviewed-by: Ravi Mistry <9fa2e7438b8cb730f96b74865492597170561628@google.com>
Commit-Queue: Eric Boren <0e499112533c8544f0505ea0d08394fb5ad7d8fa@google.com>

google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot