Also make sure that x86_64 is mapped to x64 as target arch

R=machenbach@chromium.org
LOG=n
BUG=none

Review URL: https://codereview.chromium.org/846363002

Cr-Commit-Position: refs/heads/master@{#26052}