Add amd64 to arch.canonicalize()

Allows mapping 'amd64' to 'x86_64'.

Change-Id: I0b8a527bacc2d3b4308a1eb2ce3b6d1efd71e487
Closes-Bug: 1362699
Merge "Add amd64 to arch.canonicalize()"