Merge "platform autodetect: accept amd64 as a synonym for x86_64"