No, he hasn't. That was a while ago and since then most of his statements seem to indicate a change of heart. Not to mention his desire for a 4A in a competition which has to come post 2018. I think we'll see him at least in 2018/19 season, then who knows.
I was wondering about Javier, didn't he hint he may not leave post PC 2018? I think I read that somewhere. Probably depends on whether he'll medal or not.
I'm pretty sure from pre-sochi to last season his statement was winning 2OG and retire right after. He just stop saying it only for this season.