Merge "Use correct parameters for NEON variance tests"