Johnny Rutherford, McLaren M16, Mario Andretti, McLaren M24