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

* commit 'f694ed1cdbfd2d26cdc2a008b67bfd3451522c8f':
  Remove unused arm defines.