am c3004a7b: Merge "Add defines around neon code."

* commit 'c3004a7b5c1bc83440d45d6f56627708517d8711':
  Add defines around neon code.