Dwayne Johnson and Vin Diesel Resolve Longstanding Feud, Unite for 'Fast & Furious' Future