Roku and Google find mutual ground to end childish argument over contract extension.