He did say it. He mentioned it twice during the night to Ogogo when talking about the possibility of Ogogo featuring on the undercard. Seems like it's a done deal.
I believe they had a two fight deal with Khan, with an option for a third. So yes, they would have the fight, assuming it happens.