Merge "Clean up USE_NEON to make it easier to disable NEON for benchmarking" into nyc-dev