Yafai remains on track for Edwards fight, stops Oliva in three rounds