Fixes for internal repo infra tests

Bug: skia:6763
Change-Id: I51522693ec8b81ff3b7d4349808d0e6493c5dd5b
Reviewed-on: https://skia-review.googlesource.com/19843
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2 files changed