We use a different set of names in root and contrib directories for the
same purpose.

This patch consolidates the names.

BUG=764431

Change-Id: I346a6f9ab67423b97843346bab6b0c58f516ed1d
Reviewed-on: https://chromium-review.googlesource.com/914469


Commit-Queue: Chris Blume <cblume@chromium.org>
Reviewed-by: Noel Gordon <noel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#536429}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 46f115f22260093ee7bc2a8764adf64d9c48a612