am 3c0682c6: Merge "Kill unused ARCH_* defines."

* commit '3c0682c6b52f30301a909a6f8376384a8547d376':
  Kill unused ARCH_* defines.