The French automaker will skirt longtime partner Nissan and instead team up with Geely to return to the China market.