Merge change 6928

* changes:
  set -fpu=neon so we can use arm_neon.h