am 8dcbb90d: am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."

* commit '8dcbb90dea22a876d9cc517f382bb82c98d87450':
  Remove unused arm defines.