Merge "Small fixes to script based off of cry-infra"
authorJoshua Litt <joshualitt@google.com>
Mon, 7 Apr 2014 21:43:56 +0000 (14:43 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 7 Apr 2014 21:43:56 +0000 (14:43 -0700)

Trivial merge