am a885c1bd: am 69294b5b: Merge "Add guards around neon code."

* commit 'a885c1bd06d0472822314e738815cbd2d3247988':
  Add guards around neon code.