Add back the nonfree include and bump required version of opencv.