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

* commit '57b9044b28473d9332e5fbd351c48f63bbe6f4b0':
  Add defines around neon code.