This switches a few underscores to dashes to match the infra-
side definitions.

BUG=chromium:474921
TBR=vogelheim@chromium.org, jochen@chromium.org
NOTRY=true

Review-Url: https://codereview.chromium.org/2045543002
Cr-Commit-Position: refs/heads/master@{#36753}