FreeBSD_HEAD_arm64 - Build #3581 - Fixed

[jenkins-admin at FreeBSD.org]

FreeBSD_HEAD_arm64 - Build #3581 - Fixed:

Build information: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_arm64/3581/
Full change log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_arm64/3581/changes
Full build log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_arm64/3581/console

Change summaries:

302690 by bdrewery:
Revert r302670 and r302671 for now.

MACHINE_CPUARCH smells like MACHINE except for arm64/aarch64 which
has it backwards.