Edible oil or fat compositions containing an aqueous phase