am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"

* commit '2ad7af29bb667d939f27417011567847c4b62f94':
  Check for ARCH_ARM_HAVE_NEON flag only for ARM arch