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

* commit 'f85fc022f5ad405a7e43ecb6f48bcc6e061e01b5':
  Remove unused arm defines.