arch: Update to remove armv6

There were two stray places where armv6 remained that shouldn't be
there. Remove them. Replace one with aarch64 and update MACHINE_ARCH
description of amd64 while I'm here. Eliminate a near-by contraction
igor noted.

Sponsored by: Netflix