Merge "Kill unused ARCH_* defines."