Merge "Switch remaining Neon variance functions to shifts"