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

* commit '6665600642c6aa8ecde845685852267bed786fe6':
  Kill unused ARCH_* defines.