Canelo marked his return to the ring with a hard-fought win against Christian Mbilli