GitLab

A recent change accidentally modified the mapping of OpenVR
contoller state to Gamepad buttons/axes.  This change moves back
to the original behavior.

Cq-Include-Trybots: luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ifa821ef1610e04be42cd8a6c352d4dc93c006cfa
Reviewed-on: https://chromium-review.googlesource.com/1171663
Commit-Queue: Bill Orr <billorr@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582455}