am d30b9f09: Merge "Remove unused arm defines."

* commit 'd30b9f0912b4763f0d98bdee23064015223ec03f':
  Remove unused arm defines.